use "rm --" to guard against filenames beginning with "-"

[thirdparty/dracut.git] / test / TEST-11-LVM / test.sh

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 508ac5f4f459ae27cb6b83b4e0456959dfbacfe8..47761b35863e446668ae7a1ca7c5fff2122453fc 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -4,77 +4,85 @@ TEST_DESCRIPTION="root filesystem on LVM PV"
 KVERSION=${KVERSION-$(uname -r)}
 
 # Uncomment this to debug failures
-#DEBUGFAIL="rdshell"
+#DEBUGFAIL="rd.break rd.shell"
 
 test_run() {
-    $testdir/run-qemu -hda root.ext2 -m 256M -nographic \
+    $testdir/run-qemu \
+       -hda $TESTDIR/root.ext2 \
+       -m 256M -smp 2 -nographic \
        -net none -kernel /boot/vmlinuz-$KVERSION \
-       -append "root=/dev/dracut/root rw quiet rd_retry=3 rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \
-       -initrd initramfs.testing
-    grep -m 1 -q dracut-root-block-success root.ext2 || return 1
+       -append "root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug  $DEBUGFAIL" \
+       -initrd $TESTDIR/initramfs.testing
+    grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
 }
 
 test_setup() {
     # Create the blank file to use as a root filesystem
-    dd if=/dev/zero of=root.ext2 bs=1M count=40
+    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=40
 
     kernel=$KVERSION
     # Create what will eventually be our root filesystem onto an overlay
     (
-       initdir=overlay/source
-       . $basedir/dracut-functions
+       export initdir=$TESTDIR/overlay/source
+       . $basedir/dracut-functions.sh
        dracut_install sh df free ls shutdown poweroff stty cat ps ln ip route \
-           /lib/terminfo/l/linux mount dmesg ifconfig dhclient mkdir cp ping dhclient 
-       inst "$basedir/modules.d/40network/dhclient-script" "/sbin/dhclient-script"
-       inst "$basedir/modules.d/40network/ifup" "/sbin/ifup"
+           mount dmesg ifconfig dhclient mkdir cp ping dhclient
+        for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
+           [ -f ${_terminfodir}/l/linux ] && break
+       done
+       dracut_install -o ${_terminfodir}/l/linux
+       inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
+       inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
        dracut_install grep
-       inst ./test-init /sbin/init
+        inst_simple /etc/os-release
+       inst ./test-init.sh /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth
        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
        cp -a /etc/ld.so.conf* $initdir/etc
+       mkdir $initdir/run
        sudo ldconfig -r "$initdir"
     )
- 
+
     # second, install the files needed to make the root filesystem
     (
-       initdir=overlay
-       . $basedir/dracut-functions
-       dracut_install sfdisk mke2fs poweroff cp umount 
-       inst_simple ./create-root.sh /initqueue/01create-root.sh
+       export initdir=$TESTDIR/overlay
+       . $basedir/dracut-functions.sh
+       dracut_install sfdisk mke2fs poweroff cp umount
+       inst_hook initqueue 01 ./create-root.sh
+        inst_hook initqueue/finished 01 ./finished-false.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
- 
+
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
-    $basedir/dracut -l -i overlay / \
+    $basedir/dracut.sh -l -i $TESTDIR/overlay / \
        -m "dash lvm mdraid udev-rules base rootfs-block kernel-modules" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
-       -f initramfs.makeroot $KVERSION || return 1
-    rm -rf overlay
+       -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
+    rm -rf -- $TESTDIR/overlay
     # Invoke KVM and/or QEMU to actually create the target filesystem.
-    $testdir/run-qemu -hda root.ext2 -m 256M -nographic -net none \
+    $testdir/run-qemu -hda $TESTDIR/root.ext2 -m 256M -smp 2 -nographic -net none \
        -kernel "/boot/vmlinuz-$kernel" \
-       -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
-       -initrd initramfs.makeroot  || return 1
-    grep -m 1 -q dracut-root-block-created root.ext2 || return 1
+       -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
+       -initrd $TESTDIR/initramfs.makeroot  || return 1
+    grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
     (
-       initdir=overlay
-       . $basedir/dracut-functions
+       export initdir=$TESTDIR/overlay
+       . $basedir/dracut-functions.sh
        dracut_install poweroff shutdown
-       inst_simple ./hard-off.sh /emergency/01hard-off.sh
+       inst_hook emergency 000 ./hard-off.sh
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
-    sudo $basedir/dracut -l -i overlay / \
+    sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
        -o "plymouth network" \
        -a "debug" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
-       -f initramfs.testing $KVERSION || return 1
+       -f $TESTDIR/initramfs.testing $KVERSION || return 1
 }
 
 test_cleanup() {
-    rm -fr overlay mnt
-    rm -f root.ext2 initramfs.makeroot initramfs.testing
+    return 0
 }
 
 . $testdir/test-functions