From c0321c90fabb37145db67751c948a58afc123d75 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Wed, 16 Aug 2023 13:50:47 +0200 Subject: [PATCH] test: make package libdir configurable Make the package libdir configurable to allow running the test suite out-of-tree. `PKGLIBDIR` can be pointed to the installed dracut libdir. Use `PKGLIBDIR` for the location of `dracut-init.sh`, `dracut-install`, `dracut-util`, `dracut-cpio`, and `modules.d`. This change is used to run the test suite against the installed dracut in an autopkgtest for the Debian/Ubuntu package. Signed-off-by: Benjamin Drung --- test/TEST-01-BASIC/test.sh | 4 ++-- test/TEST-02-SYSTEMD/test.sh | 4 ++-- test/TEST-03-USR-MOUNT/test.sh | 4 ++-- test/TEST-04-FULL-SYSTEMD/test.sh | 12 ++++++------ test/TEST-10-RAID/test.sh | 12 ++++++------ test/TEST-11-LVM/test.sh | 12 ++++++------ test/TEST-12-RAID-DEG/test.sh | 12 ++++++------ test/TEST-13-ENC-RAID-LVM/test.sh | 12 ++++++------ test/TEST-14-IMSM/test.sh | 12 ++++++------ test/TEST-15-BTRFSRAID/test.sh | 12 ++++++------ test/TEST-16-DMSQUASH/test.sh | 4 ++-- test/TEST-17-LVM-THIN/test.sh | 12 ++++++------ test/TEST-20-NFS/test.sh | 22 +++++++++++----------- test/TEST-30-ISCSI/test.sh | 8 ++++---- test/TEST-35-ISCSI-MULTI/test.sh | 18 +++++++++--------- test/TEST-40-NBD/test.sh | 28 ++++++++++++++-------------- test/TEST-50-MULTINIC/test.sh | 18 +++++++++--------- test/TEST-60-BONDBRIDGEVLAN/test.sh | 10 +++++----- test/TEST-63-DRACUT-CPIO/test.sh | 2 +- test/TEST-98-GETARG/test.sh | 8 ++++---- test/test-functions | 1 + 21 files changed, 114 insertions(+), 113 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 28016663..b3a86569 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -26,8 +26,8 @@ test_setup() { "$DRACUT" -l --keep --tmpdir "$TESTDIR" \ -m "test-root" \ -i ./test-init.sh /sbin/init \ - -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" \ + -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" \ --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh index f5d7427a..40d1b3e5 100755 --- a/test/TEST-02-SYSTEMD/test.sh +++ b/test/TEST-02-SYSTEMD/test.sh @@ -28,8 +28,8 @@ test_setup() { "$DRACUT" -l --keep --tmpdir "$TESTDIR" \ -m "test-root" \ -i ./test-init.sh /sbin/init \ - -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" \ + -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" \ --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh index a6c52ce9..69ffda38 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -45,8 +45,8 @@ test_setup() { -m "test-root" \ -i ./test-init.sh /sbin/init \ -i ./fstab /etc/fstab \ - -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" \ + -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" \ --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh index 078363b5..160104f1 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -56,19 +56,19 @@ test_setup() { -I "ldconfig" \ -i ./test-init.sh /sbin/test-init \ -i ./fstab /etc/fstab \ - -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" \ + -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" \ --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && cp -a "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* && export initdir=$TESTDIR/overlay/source if type -P rpm &> /dev/null; then - rpm -ql systemd | xargs -r "$basedir"/dracut-install ${initdir:+-D "$initdir"} -o -a -l + rpm -ql systemd | xargs -r "$PKGLIBDIR"/dracut-install ${initdir:+-D "$initdir"} -o -a -l elif type -P dpkg &> /dev/null; then - dpkg -L systemd | xargs -r "$basedir"/dracut-install ${initdir:+-D "$initdir"} -o -a -l + dpkg -L systemd | xargs -r "$PKGLIBDIR"/dracut-install ${initdir:+-D "$initdir"} -o -a -l elif type -P pacman &> /dev/null; then - pacman -Q -l systemd | while read -r _ a; do printf -- "%s\0" "$a"; done | xargs -0 -r "$basedir"/dracut-install ${initdir:+-D "$initdir"} -o -a -l + pacman -Q -l systemd | while read -r _ a; do printf -- "%s\0" "$a"; done | xargs -0 -r "$PKGLIBDIR"/dracut-install ${initdir:+-D "$initdir"} -o -a -l else echo "Can't install systemd base" return 1 @@ -82,7 +82,7 @@ test_setup() { | while read -r i || [ -n "$i" ]; do i=${i##Exec*=} i=${i##-} - "$basedir"/dracut-install ${initdir:+-D "$initdir"} -o -a -l "$i" + "$PKGLIBDIR"/dracut-install ${initdir:+-D "$initdir"} -o -a -l "$i" done # setup the testsuite target diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 9b263d97..15cbf56d 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -30,7 +30,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -43,9 +43,9 @@ test_setup() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -64,7 +64,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount dd sync grep inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -101,7 +101,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 38597c2e..27828100 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -31,7 +31,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -44,9 +44,9 @@ test_setup() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -65,7 +65,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount dd sync inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -100,7 +100,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index b4c51e4f..da5177b6 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -62,7 +62,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -75,9 +75,9 @@ test_setup() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -95,7 +95,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount dd grep sync inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -136,7 +136,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index d9e73490..fe792239 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -58,7 +58,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -71,9 +71,9 @@ test_setup() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -91,7 +91,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount grep dd sync inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -131,7 +131,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index 227f05ee..8b95f3f6 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -56,7 +56,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -70,9 +70,9 @@ test_setup() { inst_multiple -o ${_terminfodir}/l/linux inst_simple /etc/os-release - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -90,7 +90,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount grep dd sync realpath inst_hook initqueue 01 ./create-root.sh ) @@ -131,7 +131,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh index 2080672d..068146e3 100755 --- a/test/TEST-15-BTRFSRAID/test.sh +++ b/test/TEST-15-BTRFSRAID/test.sh @@ -34,7 +34,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -47,9 +47,9 @@ test_setup() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -67,7 +67,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.btrfs poweroff cp umount dd sync inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -106,7 +106,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh index 95157084..3fecc920 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -84,8 +84,8 @@ test_setup() { "$DRACUT" -l --keep --tmpdir "$TESTDIR" \ -m "test-root" \ -i ./test-init.sh /sbin/init \ - -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" \ + -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" \ --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1 mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh index 9dc16e2d..5010e48a 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -29,7 +29,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -42,9 +42,9 @@ test_setup() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -63,7 +63,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount grep dmsetup dd sync inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -98,7 +98,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 6040544c..715de352 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -237,7 +237,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/server/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit @@ -298,7 +298,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/server/overlay/source/nfs/client # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit @@ -315,12 +315,12 @@ test_setup() { fi done - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_simple "${basedir}/modules.d/45url-lib/url-lib.sh" "/lib/url-lib.sh" - inst_simple "${basedir}/modules.d/40network/net-lib.sh" "/lib/net-lib.sh" - inst_simple "${basedir}/modules.d/95nfs/nfs-lib.sh" "/lib/nfs-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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_simple "${PKGLIBDIR}/modules.d/45url-lib/url-lib.sh" "/lib/url-lib.sh" + inst_simple "${PKGLIBDIR}/modules.d/40network/net-lib.sh" "/lib/net-lib.sh" + inst_simple "${PKGLIBDIR}/modules.d/95nfs/nfs-lib.sh" "/lib/nfs-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" @@ -353,7 +353,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/server/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount sync dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -390,7 +390,7 @@ test_setup() { export initdir="$TESTDIR"/overlay mkdir -p "$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh @@ -408,7 +408,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir="$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh rm "$initdir"/etc/systemd/network/01-client.link inst_simple ./server.link /etc/systemd/network/01-server.link inst_hook pre-mount 99 ./wait-if-server.sh diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index a3d7058a..ac9f0960 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -134,8 +134,8 @@ test_setup() { -m "test-root" \ -i ./client-init.sh /sbin/init \ -I "ip ping 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" \ + -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" \ --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.* @@ -173,8 +173,8 @@ test_setup() { -m "test-root network network-legacy" \ -d "iscsi_tcp crc32c ipv6" \ -i ./server-init.sh /sbin/init \ - -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" \ + -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 ping 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 "./hosts" "/etc/hosts" \ diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh index 7b612542..3e649a85 100755 --- a/test/TEST-35-ISCSI-MULTI/test.sh +++ b/test/TEST-35-ISCSI-MULTI/test.sh @@ -148,7 +148,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p -- dev sys proc etc var/run tmp @@ -163,9 +163,9 @@ test_setup() { inst_multiple -o ${_terminfodir}/l/linux inst_simple /etc/os-release - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -180,7 +180,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount setsid dd sync blockdev inst_hook initqueue 01 ./create-client-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -220,7 +220,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p dev sys proc etc var/run tmp var/lib/dhcpd /etc/iscsi @@ -265,7 +265,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount sync dd inst_hook initqueue 01 ./create-server-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -302,7 +302,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh @@ -319,7 +319,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir="$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh rm "$initdir"/etc/systemd/network/01-client.link inst_simple ./server.link /etc/systemd/network/01-server.link inst_hook pre-mount 99 ./wait-if-server.sh diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index f1029908..7fd1efca 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -194,7 +194,7 @@ make_encrypted_root() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh mkdir -p "$initdir" ( cd "$initdir" || exit @@ -208,9 +208,9 @@ make_encrypted_root() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -227,7 +227,7 @@ make_encrypted_root() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit mkdir -p dev sys proc etc tmp var run root @@ -274,7 +274,7 @@ make_client_root() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh mkdir -p "$initdir" ( cd "$initdir" || exit @@ -287,9 +287,9 @@ make_client_root() { done inst_multiple -o ${_terminfodir}/l/linux - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -312,7 +312,7 @@ make_client_root() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount sync dd inst_hook initqueue 01 ./create-client-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -353,7 +353,7 @@ make_server_root() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh mkdir -p "$initdir" ( cd "$initdir" || exit @@ -408,7 +408,7 @@ EOF # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount sync dd sync inst_hook initqueue 01 ./create-server-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -451,7 +451,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown dd inst_hook shutdown-emergency 000 ./hard-off.sh inst ./cryptroot-ask.sh /sbin/cryptroot-ask @@ -478,7 +478,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir="$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh rm "$initdir"/etc/systemd/network/01-client.link inst_simple ./server.link /etc/systemd/network/01-server.link inst_hook pre-mount 99 ./wait-if-server.sh diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index dd4e41f5..4e34c327 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -179,7 +179,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit @@ -239,7 +239,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay/source/nfs/client # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit @@ -255,9 +255,9 @@ test_setup() { fi done - inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" - inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" - inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util" + 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" @@ -290,7 +290,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount sync dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -327,14 +327,14 @@ test_setup() { export initdir="$TESTDIR"/overlay mkdir -p "$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown inst_hook shutdown-emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh inst_simple ./client.link /etc/systemd/network/01-client.link inst_binary awk - inst_hook pre-pivot 85 "$basedir/modules.d/45ifcfg/write-ifcfg.sh" + inst_hook pre-pivot 85 "$PKGLIBDIR/modules.d/45ifcfg/write-ifcfg.sh" ) # Make client's dracut image "$DRACUT" -l -i "$TESTDIR"/overlay / \ @@ -347,7 +347,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir="$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh rm "$initdir"/etc/systemd/network/01-client.link inst_simple ./server.link /etc/systemd/network/01-server.link inst_hook pre-mount 99 ./wait-if-server.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/test.sh b/test/TEST-60-BONDBRIDGEVLAN/test.sh index 24f3e37a..5110ddb1 100755 --- a/test/TEST-60-BONDBRIDGEVLAN/test.sh +++ b/test/TEST-60-BONDBRIDGEVLAN/test.sh @@ -209,7 +209,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir=$TESTDIR/overlay/source # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh ( cd "$initdir" || exit @@ -279,7 +279,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay/source/nfs/client # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sh shutdown poweroff stty cat ps ln ip \ mount dmesg mkdir cp ping grep ls sort dd sed basename for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do @@ -322,7 +322,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir=$TESTDIR/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple sfdisk mkfs.ext4 poweroff cp umount sync dd inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh @@ -358,7 +358,7 @@ test_setup() { # shellcheck disable=SC2030 export initdir="$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh inst_multiple poweroff shutdown inst_hook emergency 000 ./hard-off.sh inst_simple ./client.link /etc/systemd/network/01-client.link @@ -375,7 +375,7 @@ test_setup() { # shellcheck disable=SC2031 export initdir="$TESTDIR"/overlay # shellcheck disable=SC1090 - . "$basedir"/dracut-init.sh + . "$PKGLIBDIR"/dracut-init.sh rm "$initdir"/etc/systemd/network/01-client.link inst_simple ./server.link /etc/systemd/network/01-server.link inst_hook pre-mount 99 ./wait-if-server.sh diff --git a/test/TEST-63-DRACUT-CPIO/test.sh b/test/TEST-63-DRACUT-CPIO/test.sh index 163bab2a..f9dff107 100755 --- a/test/TEST-63-DRACUT-CPIO/test.sh +++ b/test/TEST-63-DRACUT-CPIO/test.sh @@ -7,7 +7,7 @@ TEST_DESCRIPTION="kernel cpio extraction tests for dracut-cpio" # see dracut-cpio source for unit tests test_check() { - if ! [[ -x $basedir/dracut-cpio ]]; then + if ! [[ -x "$PKGLIBDIR/dracut-cpio" ]]; then echo "Test needs dracut-cpio... Skipping" return 1 fi diff --git a/test/TEST-98-GETARG/test.sh b/test/TEST-98-GETARG/test.sh index 012396ba..74a1bec5 100755 --- a/test/TEST-98-GETARG/test.sh +++ b/test/TEST-98-GETARG/test.sh @@ -12,10 +12,10 @@ test_check() { test_setup() { make -C "$basedir" dracut-util - ln -sfnr "$basedir"/dracut-util "$TESTDIR"/dracut-getarg - ln -sfnr "$basedir"/dracut-util "$TESTDIR"/dracut-getargs - ln -sfnr "$basedir"/modules.d/99base/dracut-lib.sh "$TESTDIR"/dracut-lib.sh - ln -sfnr "$basedir"/modules.d/99base/dracut-dev-lib.sh "$TESTDIR"/dracut-dev-lib.sh + ln -sfnr "$PKGLIBDIR"/dracut-util "$TESTDIR"/dracut-getarg + ln -sfnr "$PKGLIBDIR"/dracut-util "$TESTDIR"/dracut-getargs + ln -sfnr "$PKGLIBDIR"/modules.d/99base/dracut-lib.sh "$TESTDIR"/dracut-lib.sh + ln -sfnr "$PKGLIBDIR"/modules.d/99base/dracut-dev-lib.sh "$TESTDIR"/dracut-dev-lib.sh return 0 } diff --git a/test/test-functions b/test/test-functions index ee8a5920..58a87a5d 100644 --- a/test/test-functions +++ b/test/test-functions @@ -17,6 +17,7 @@ KVERSION=${KVERSION-$(uname -r)} if [[ -z $basedir ]]; then basedir="$(realpath ../..)"; fi DRACUT=${DRACUT-${basedir}/dracut.sh} +PKGLIBDIR=${PKGLIBDIR-$basedir} test_dracut() { TEST_DRACUT_ARGS+=" --local --no-hostonly --no-early-microcode --add test --kver $KVERSION"