diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2024-01-03 20:25:45 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2024-01-03 22:00:24 +0100 |
commit | e2f5262f1f9e279bfb0ace9caf913ac1021064f9 (patch) | |
tree | 138d8a02a74cd85cc26af28b49c4a1d967b11c53 /source/installer | |
parent | 4c234135eea81183ecccd37c3281a746954c443d (diff) | |
download | current-20240103202545.tar.gz current-20240103202545.tar.xz |
Wed Jan 3 20:25:45 UTC 202420240103202545
ap/vim-9.1.0-x86_64-1.txz: Upgraded.
d/clisp-2.50_20230718_669249717-x86_64-1.txz: Upgraded.
l/poppler-24.01.0-x86_64-1.txz: Upgraded.
n/c-ares-1.25.0-x86_64-1.txz: Upgraded.
n/mobile-broadband-provider-info-20231023-x86_64-1.txz: Upgraded.
n/ncftp-3.2.7-x86_64-1.txz: Upgraded.
xap/vim-gvim-9.1.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/installer')
-rw-r--r-- | source/installer/ChangeLog.txt | 7 | ||||
-rwxr-xr-x | source/installer/build_installer.sh | 10 | ||||
-rwxr-xr-x | source/installer/sources/initrd/etc/rc.d/rc.S | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index f6715af36..600af2d24 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Tue Jan 2 09:03:56 UTC 2024 + build_installer.sh: Switch /sbin/modinfo from BusyBox's implementation to + kmod's, as the busybox implementation doesn't work. + Switch /bin/grep to the GNU implementation for a richer feature set. + Use the /bin/{e,f}grep shell wrappers, aligned with the OS. + /etc/rc.d/rc.S: Call /bin/grep rather than /bin/grep.bin ++--------------------------+ Mon Dec 11 20:24:00 UTC 2023 build_installer.sh: On x86, don't try to use a kernel with an -smp LOCALVERSION as it's no longer built. The regularly-named kernels are now diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 8c4588382..86e580a02 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -1,9 +1,7 @@ #!/bin/bash set +o posix -# $Id: build_installer.sh,v 1.129 2011/04/13 23:03:07 eha Exp eha $ -# -# Copyright 2005-2023 Stuart Winter, Surrey, England, UK +# Copyright 2005-2024 Stuart Winter, Surrey, England, UK # Copyright 2008, 2009, 2010, 2011, 2017 Eric Hameleers, Eindhoven, Netherlands # Copyright 2011-2020 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. @@ -587,9 +585,6 @@ rm -rf $TMP/extract-packages # Re-create essential symlinks ln -sf sbin/init init -( cd bin; ln -sf grep.bin grep ) -( cd bin; ln -sf grep.bin egrep ) -( cd bin; ln -sf grep.bin fgrep ) ( cd bin; ln -sf gzip zcat ) ( cd bin; ln -sf /usr/bin/compress compress ) ( cd usr/bin; ln -sf ../../bin/gzip zcat ) @@ -1065,6 +1060,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_BIN} \ dircolors \ findmnt \ gzip \ + grep egrep fgrep pgrep \ ipmask \ ls \ lsblk \ @@ -1086,7 +1082,6 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_BIN} \ $(readlink -s setterm 1>/dev/null) || \ cp --remove-destination -fa${VERBOSE1} setterm \ $PKG/$ARCH-installer-filesystem/bin/ -cp --remove-destination -fa${VERBOSE1} grep $PKG/$ARCH-installer-filesystem/bin/grep.bin cd $TMP/extract-packages/usr/bin cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \ bash \ @@ -1163,6 +1158,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_SBIN} \ mkfs.* \ mklost+found \ mkswap \ + modinfo \ modprobe \ mount \ mdadm \ diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S index dec350d0a..0e69d7349 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.S +++ b/source/installer/sources/initrd/etc/rc.d/rc.S @@ -20,8 +20,8 @@ fi # Note: this does not configure the OS root password. # Passwords should be set as follows within the Kernel cmdline: # instrootpw=yourpassword -if grep.bin -qoP 'instrootpw=\K\S+' /proc/cmdline ; then - /bin/echo "root:$( grep.bin -oP 'instrootpw=\K\S+' /proc/cmdline )" | /bin/busybox chpasswd +if grep -qoP 'instrootpw=\K\S+' /proc/cmdline ; then + /bin/echo "root:$( grep -oP 'instrootpw=\K\S+' /proc/cmdline )" | /bin/busybox chpasswd fi # Activate swap: |