diff options
Diffstat (limited to 'source/installer')
| -rw-r--r-- | source/installer/ChangeLog.txt | 4 | ||||
| -rwxr-xr-x | source/installer/installer.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/installer/repack_installer.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/etc/rc.d/rc.pcmcia | 2 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/sbin/probe | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 8850f9c0f..4142dae59 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,7 @@ +Tue Sep 6 18:34:42 UTC 2022 + rc.pcmcia: change fgrep to grep -F. + /sbin/probe: change egrep to grep -E. ++--------------------------+ Fri Aug 19 08:08:08 UTC 2022 /etc/rc.d/rc.S: Added support for setting the Installer's root password from a Kernel cmdline key value pair, instrootpw=yourpassword diff --git a/source/installer/installer.SlackBuild b/source/installer/installer.SlackBuild index c0040b005..ef6a4e6ed 100755 --- a/source/installer/installer.SlackBuild +++ b/source/installer/installer.SlackBuild @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then SLACKROOT=${SLACKROOT:-/root/slackware64-current} OUTPUT=${OUTPUT:-$TMP/output-x86_64-$(uname -r)} ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl SLACKROOT=${SLACKROOT:-/root/slackware-current} OUTPUT=${OUTPUT:-$TMP/output-arm-$(uname -r)} ;; diff --git a/source/installer/repack_installer.SlackBuild b/source/installer/repack_installer.SlackBuild index b8b2af91f..ecf8c5caa 100755 --- a/source/installer/repack_installer.SlackBuild +++ b/source/installer/repack_installer.SlackBuild @@ -41,7 +41,7 @@ if [ -z "$ARCH" ]; then SLACKROOT=${SLACKROOT:-/root/slackware64-current} OUTPUT=${OUTPUT:-$TMP/output-x86_64-$(uname -r)} ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl SLACKROOT=${SLACKROOT:-/root/slackware-current} OUTPUT=${OUTPUT:-$TMP/output-arm-$(uname -r)} ;; diff --git a/source/installer/sources/initrd/etc/rc.d/rc.pcmcia b/source/installer/sources/initrd/etc/rc.d/rc.pcmcia index 1f21be84e..46621da97 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.pcmcia +++ b/source/installer/sources/initrd/etc/rc.d/rc.pcmcia @@ -14,7 +14,7 @@ DRIVER_OPTS= case "$1" in start) echo "Starting PCMCIA services:" - fgrep -q pcmcia /proc/devices + grep -F -q pcmcia /proc/devices if [ $? -ne 0 ] ; then if [ "$DRIVER" = "probe" ]; then echo " <Probing for PCIC: edit /etc/rc.d/rc.pcmcia>" diff --git a/source/installer/sources/initrd/sbin/probe b/source/installer/sources/initrd/sbin/probe index 3b481432f..5ab7602fc 100755 --- a/source/installer/sources/initrd/sbin/probe +++ b/source/installer/sources/initrd/sbin/probe @@ -155,7 +155,7 @@ list_mmc() { local device # Filter out any partitions on the block device, as we'll use # fdisk to capture those: - lsblk -o name,type -ripnd /dev/mmcblk* | egrep 'disk$' | awk '{print $1}' | while read device ; do + lsblk -o name,type -ripnd /dev/mmcblk* | grep -E 'disk$' | awk '{print $1}' | while read device ; do fdisk -l $device >> $TMP/SeTfdisk done } |