From: Jo Zzsi Date: Tue, 10 Sep 2024 02:42:07 +0000 (-0400) Subject: test: remove dracut-lib.sh dependency from real rootfs X-Git-Tag: 104~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0fed792596361ea71b24d36bf6c352c8081349e;p=thirdparty%2Fdracut-ng.git test: remove dracut-lib.sh dependency from real rootfs --- diff --git a/modules.d/80test-root/test-init.sh b/modules.d/80test-root/test-init.sh index 49116fa86..c7ab6f63a 100755 --- a/modules.d/80test-root/test-init.sh +++ b/modules.d/80test-root/test-init.sh @@ -27,20 +27,6 @@ else echo "All OK" fi -export TERM=linux -export PS1='initramfs-test:\w\$ ' -stty sane echo "made it to the rootfs!" - -. /lib/dracut-lib.sh - -if getargbool 0 rd.shell; then - strstr "$(setsid --help)" "control" && CTTY="-c" - setsid ${CTTY:+"${CTTY}"} sh -i -fi - echo "Powering down." -if [ -d /run/initramfs/etc ]; then - echo " rd.debug=0 " >> /run/initramfs/etc/cmdline -fi poweroff -f diff --git a/test/TEST-20-NFS/client-init.sh b/test/TEST-20-NFS/client-init.sh index f50d0e2db..988890ca6 100755 --- a/test/TEST-20-NFS/client-init.sh +++ b/test/TEST-20-NFS/client-init.sh @@ -7,15 +7,6 @@ export PATH=/usr/sbin:/usr/bin:/sbin:/bin command -v plymouth > /dev/null 2>&1 && plymouth --quit exec > /dev/console 2>&1 -export TERM=linux -export PS1='initramfs-test:\w\$ ' -stty sane -if getargbool 0 rd.shell; then - [ -c /dev/watchdog ] && printf 'V' > /dev/watchdog - strstr "$(setsid --help)" "control" && CTTY="-c" - setsid ${CTTY:+"${CTTY}"} sh -i -fi - echo "made it to the rootfs! Powering down." while read -r dev _ fstype opts rest || [ -n "$dev" ]; do diff --git a/test/TEST-30-ISCSI/client-init.sh b/test/TEST-30-ISCSI/client-init.sh index ab70d17d8..1062323b1 100755 --- a/test/TEST-30-ISCSI/client-init.sh +++ b/test/TEST-30-ISCSI/client-init.sh @@ -1,13 +1,9 @@ #!/bin/sh -. /lib/dracut-lib.sh export PATH=/usr/sbin:/usr/bin:/sbin:/bin command -v plymouth > /dev/null 2>&1 && plymouth --quit exec > /dev/console 2>&1 -export TERM=linux -export PS1='initramfs-test:\w\$ ' -stty sane echo "made it to the rootfs! Powering down." while read -r dev _ fstype opts rest || [ -n "$dev" ]; do [ "$fstype" != "ext4" ] && continue @@ -15,10 +11,5 @@ while read -r dev _ fstype opts rest || [ -n "$dev" ]; do break done < /proc/mounts -if getargbool 0 rd.shell; then - strstr "$(setsid --help)" "control" && CTTY="-c" - setsid ${CTTY:+"${CTTY}"} sh -i -fi - sync poweroff -f diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 675c12f15..72c2241fd 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -137,8 +137,6 @@ test_setup() { "$DRACUT" -N -l --keep --tmpdir "$TESTDIR" \ -m "test-root" \ -I "ip grep setsid" \ - -i "${PKGLIBDIR}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \ - -i "${PKGLIBDIR}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -175,8 +173,6 @@ test_setup() { "$DRACUT" -N -l --keep --tmpdir "$TESTDIR" \ -m "test-root network-legacy" \ -d "iscsi_tcp crc32c ipv6" \ - -i "${PKGLIBDIR}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \ - -i "${PKGLIBDIR}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \ -I "modprobe chmod ip tcpdump setsid pidof tgtd tgtadm /etc/passwd" \ --install-optional "/etc/netconfig dhcpd /etc/group /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services" \ -i "./dhcpd.conf" "/etc/dhcpd.conf" \ diff --git a/test/TEST-35-ISCSI-MULTI/client-init.sh b/test/TEST-35-ISCSI-MULTI/client-init.sh index ab70d17d8..1062323b1 100755 --- a/test/TEST-35-ISCSI-MULTI/client-init.sh +++ b/test/TEST-35-ISCSI-MULTI/client-init.sh @@ -1,13 +1,9 @@ #!/bin/sh -. /lib/dracut-lib.sh export PATH=/usr/sbin:/usr/bin:/sbin:/bin command -v plymouth > /dev/null 2>&1 && plymouth --quit exec > /dev/console 2>&1 -export TERM=linux -export PS1='initramfs-test:\w\$ ' -stty sane echo "made it to the rootfs! Powering down." while read -r dev _ fstype opts rest || [ -n "$dev" ]; do [ "$fstype" != "ext4" ] && continue @@ -15,10 +11,5 @@ while read -r dev _ fstype opts rest || [ -n "$dev" ]; do break done < /proc/mounts -if getargbool 0 rd.shell; then - strstr "$(setsid --help)" "control" && CTTY="-c" - setsid ${CTTY:+"${CTTY}"} sh -i -fi - sync poweroff -f diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh index 1b00b9aea..eae8478d8 100755 --- a/test/TEST-35-ISCSI-MULTI/test.sh +++ b/test/TEST-35-ISCSI-MULTI/test.sh @@ -150,8 +150,6 @@ test_setup() { "$DRACUT" -l --keep --tmpdir "$TESTDIR" \ -m "test-root" \ -I "ip grep setsid" \ - -i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \ - -i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \ --no-hostonly --no-hostonly-cmdline --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -190,8 +188,6 @@ test_setup() { -m "test-root network-legacy iscsi" \ -d "iscsi_tcp crc32c ipv6 af_packet" \ -I "ip grep sleep setsid chmod modprobe pidof tgtd tgtadm" \ - -i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \ - -i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \ --install-optional "/etc/netconfig dhcpd /etc/group /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services" \ -i /tmp/config /etc/nbd-server/config \ -i "./dhcpd.conf" "/etc/dhcpd.conf" \ diff --git a/test/TEST-40-NBD/client-init.sh b/test/TEST-40-NBD/client-init.sh index b8637f00d..b86dd94c0 100755 --- a/test/TEST-40-NBD/client-init.sh +++ b/test/TEST-40-NBD/client-init.sh @@ -1,6 +1,5 @@ #!/bin/sh : > /dev/watchdog -. /lib/dracut-lib.sh export PATH=/usr/sbin:/usr/bin:/sbin:/bin command -v plymouth > /dev/null 2>&1 && plymouth --quit @@ -13,16 +12,8 @@ while read -r dev fs fstype opts rest || [ -n "$dev" ]; do echo "nbd-OK $fstype $opts" break done < /proc/mounts -export TERM=linux -export PS1='nbdclient-test:\w\$ ' -stty sane echo "made it to the rootfs! Powering down." -if getargbool 0 rd.shell; then - strstr "$(setsid --help)" "control" && CTTY="-c" - setsid ${CTTY:+"${CTTY}"} sh -i -fi - mount -n -o remount,ro / sync diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 9fceab599..4a168a51d 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -192,8 +192,6 @@ make_encrypted_root() { "$DRACUT" -l --keep --tmpdir "$TESTDIR" \ -m "test-root" \ -I "ip grep" \ - -i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \ - -i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \ --no-hostonly --no-hostonly-cmdline --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -230,8 +228,6 @@ make_client_root() { "$DRACUT" -l --keep --tmpdir "$TESTDIR" \ -m "test-root" \ -I "ip" \ - -i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \ - -i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \ --no-hostonly --no-hostonly-cmdline --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -280,8 +276,6 @@ EOF "$DRACUT" -l --keep --tmpdir "$TESTDIR" \ -m "test-root network-legacy" \ -I "ip grep sleep nbd-server chmod modprobe vi pidof" \ - -i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \ - -i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \ --install-optional "/etc/netconfig dhcpd /etc/group /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services" \ -i /tmp/config /etc/nbd-server/config \ -i "./dhcpd.conf" "/etc/dhcpd.conf" \ diff --git a/test/TEST-50-MULTINIC/client-init.sh b/test/TEST-50-MULTINIC/client-init.sh index 09db5b385..2ef664eae 100755 --- a/test/TEST-50-MULTINIC/client-init.sh +++ b/test/TEST-50-MULTINIC/client-init.sh @@ -1,13 +1,9 @@ #!/bin/sh -. /lib/dracut-lib.sh export PATH=/usr/sbin:/usr/bin:/sbin:/bin command -v plymouth > /dev/null 2>&1 && plymouth --quit exec > /dev/console 2>&1 -export TERM=linux -export PS1='initramfs-test:\w\$ ' -stty sane echo "made it to the rootfs! Powering down." set -x @@ -34,7 +30,5 @@ done echo "$IFACES" } | dd oflag=direct,dsync of=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_marker status=none -getargbool 0 rd.shell && sh -i - sync poweroff -f diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 0ac65da72..940a2cafd 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -257,12 +257,6 @@ test_setup() { fi done - inst_simple "${PKGLIBDIR}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${PKGLIBDIR}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${PKGLIBDIR}/dracut-util" "/usr/bin/dracut-util" - ln -s dracut-util "${initdir}/usr/bin/dracut-getarg" - ln -s dracut-util "${initdir}/usr/bin/dracut-getargs" - inst ./client-init.sh /sbin/init inst_simple /etc/os-release inst_multiple -o {,/usr}/etc/nsswitch.conf