TEST-30-ISCSI: add test case for "root=iscsi:...." and untabify

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 667c6a98bbe12fdb8ab9c8df89226294cc4bf97e..7899f76aebc5b2d3afb20c03fc5be0d56d8ac10f 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -12,18 +12,18 @@ run_server() {
     echo "iSCSI TEST SETUP: Starting DHCP/iSCSI server"
 
     $testdir/run-qemu \
-       -hda $TESTDIR/server.ext2 \
-       -hdb $TESTDIR/root.ext2 \
-       -hdc $TESTDIR/iscsidisk2.img \
-       -hdd $TESTDIR/iscsidisk3.img \
-       -m 256M -nographic \
-       -net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-       -net socket,listen=127.0.0.1:12330 \
-       -serial $SERIAL \
-       -kernel /boot/vmlinuz-$KVERSION \
-       -append "root=/dev/sda rw quiet console=ttyS0,115200n81 selinux=0" \
-       -initrd $TESTDIR/initramfs.server \
-       -pidfile $TESTDIR/server.pid -daemonize || return 1
+        -hda $TESTDIR/server.ext2 \
+        -hdb $TESTDIR/root.ext2 \
+        -hdc $TESTDIR/iscsidisk2.img \
+        -hdd $TESTDIR/iscsidisk3.img \
+        -m 256M -nographic \
+        -net nic,macaddr=52:54:00:12:34:56,model=e1000 \
+        -net socket,listen=127.0.0.1:12330 \
+        -serial $SERIAL \
+        -kernel /boot/vmlinuz-$KVERSION \
+        -append "root=/dev/sda rw quiet console=ttyS0,115200n81 selinux=0" \
+        -initrd $TESTDIR/initramfs.server \
+        -pidfile $TESTDIR/server.pid -daemonize || return 1
     sudo chmod 644 $TESTDIR/server.pid || return 1
 
     # Cleanup the terminal if we have one
@@ -37,55 +37,70 @@ run_client() {
 
     # Need this so kvm-qemu will boot (needs non-/dev/zero local disk)
     if ! dd if=/dev/zero of=$TESTDIR/client.img bs=1M count=1; then
-       echo "Unable to make client sda image" 1>&2
-       return 1
+        echo "Unable to make client sda image" 1>&2
+        return 1
     fi
 
     $testdir/run-qemu \
-       -hda $TESTDIR/client.img \
-       -m 256M -nographic \
-       -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
-       -net socket,connect=127.0.0.1:12330 \
-       -kernel /boot/vmlinuz-$KVERSION \
-       -append "root=LABEL=sysroot ip=192.168.50.101::192.168.50.1:255.255.255.0:iscsi-1:eth0:off netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2 rw quiet rd.retry=5 rd.debug rd.info  console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
-       -initrd $TESTDIR/initramfs.testing
+        -hda $TESTDIR/client.img \
+        -m 256M -nographic \
+        -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
+        -net socket,connect=127.0.0.1:12330 \
+        -kernel /boot/vmlinuz-$KVERSION \
+        -append "root=iscsi:192.168.50.1::::iqn.2009-06.dracut:target0 ip=192.168.50.101::192.168.50.1:255.255.255.0:iscsi-1:eth0:off rw quiet rd.retry=5 rd.debug rd.info  console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
+        -initrd $TESTDIR/initramfs.testing
     grep -m 1 -q iscsi-OK $TESTDIR/client.img || return 1
 
     if ! dd if=/dev/zero of=$TESTDIR/client.img bs=1M count=1; then
-       echo "Unable to make client sda image" 1>&2
-       return 1
+        echo "Unable to make client sda image" 1>&2
+        return 1
     fi
 
     $testdir/run-qemu \
-       -hda $TESTDIR/client.img \
-       -m 256M -nographic \
-       -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
-       -net socket,connect=127.0.0.1:12330 \
-       -kernel /boot/vmlinuz-$KVERSION \
-       -append "root=dhcp rw quiet rd.retry=5 rd.debug rd.info  console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
-       -initrd $TESTDIR/initramfs.testing
+        -hda $TESTDIR/client.img \
+        -m 256M -nographic \
+        -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
+        -net socket,connect=127.0.0.1:12330 \
+        -kernel /boot/vmlinuz-$KVERSION \
+        -append "root=LABEL=sysroot ip=192.168.50.101::192.168.50.1:255.255.255.0:iscsi-1:eth0:off netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1 netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2 rw quiet rd.retry=5 rd.debug rd.info  console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
+        -initrd $TESTDIR/initramfs.testing
+    grep -m 1 -q iscsi-OK $TESTDIR/client.img || return 1
+
+    if ! dd if=/dev/zero of=$TESTDIR/client.img bs=1M count=1; then
+        echo "Unable to make client sda image" 1>&2
+        return 1
+    fi
+
+    $testdir/run-qemu \
+        -hda $TESTDIR/client.img \
+        -m 256M -nographic \
+        -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
+        -net socket,connect=127.0.0.1:12330 \
+        -kernel /boot/vmlinuz-$KVERSION \
+        -append "root=dhcp rw quiet rd.retry=5 rd.debug rd.info  console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
+        -initrd $TESTDIR/initramfs.testing
     grep -m 1 -q iscsi-OK $TESTDIR/client.img || return 1
 
 }
 
 test_run() {
     if ! run_server; then
-       echo "Failed to start server" 1>&2
-       return 1
+        echo "Failed to start server" 1>&2
+        return 1
     fi
     run_client
     ret=$?
     if [[ -s $TESTDIR/server.pid ]]; then
-       sudo kill -TERM $(cat $TESTDIR/server.pid)
-       rm -f $TESTDIR/server.pid
+        sudo kill -TERM $(cat $TESTDIR/server.pid)
+        rm -f $TESTDIR/server.pid
     fi
     return $ret
 }
 
 test_setup() {
     if [ ! -x /usr/sbin/iscsi-target ]; then
-       echo "Need iscsi-target from netbsd-iscsi"
-       return 1
+        echo "Need iscsi-target from netbsd-iscsi"
+        return 1
     fi
 
     # Create the blank file to use as a root filesystem
@@ -96,68 +111,68 @@ test_setup() {
     kernel=$KVERSION
     # Create what will eventually be our root filesystem onto an overlay
     (
-       initdir=$TESTDIR/overlay/source
-       . $basedir/dracut-functions
-       dracut_install sh shutdown poweroff stty cat ps ln ip \
+        initdir=$TESTDIR/overlay/source
+        . $basedir/dracut-functions
+        dracut_install sh shutdown poweroff stty cat ps ln ip \
             mount dmesg mkdir cp ping grep
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
-           [ -f ${_terminfodir}/l/linux ] && break
-       done
-       dracut_install -o ${_terminfodir}/l/linux
-       inst ./client-init /sbin/init
-       (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-       cp -a /etc/ld.so.conf* $initdir/etc
-       sudo ldconfig -r "$initdir"
+            [ -f ${_terminfodir}/l/linux ] && break
+        done
+        dracut_install -o ${_terminfodir}/l/linux
+        inst ./client-init /sbin/init
+        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+        cp -a /etc/ld.so.conf* $initdir/etc
+        sudo ldconfig -r "$initdir"
     )
 
     # second, install the files needed to make the root filesystem
     (
-       initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions
-       dracut_install sfdisk mke2fs poweroff cp umount
-       inst_hook initqueue 01 ./create-root.sh
-       inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        initdir=$TESTDIR/overlay
+        . $basedir/dracut-functions
+        dracut_install sfdisk mke2fs poweroff cp umount
+        inst_hook initqueue 01 ./create-root.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 $TESTDIR/overlay / \
-       -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
-       -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
-       -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
+        -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
+        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
     rm -rf $TESTDIR/overlay
 
 
     # Need this so kvm-qemu will boot (needs non-/dev/zero local disk)
     if ! dd if=/dev/null of=$TESTDIR/client.img bs=1M seek=1; then
-       echo "Unable to make client sdb image" 1>&2
-       return 1
+        echo "Unable to make client sdb image" 1>&2
+        return 1
     fi
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     $testdir/run-qemu \
-       -hda $TESTDIR/root.ext2 \
-       -hdb $TESTDIR/client.img \
-       -hdc $TESTDIR/iscsidisk2.img \
-       -hdd $TESTDIR/iscsidisk3.img \
-       -m 256M -nographic -net none \
-       -kernel "/boot/vmlinuz-$kernel" \
-       -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
-       -initrd $TESTDIR/initramfs.makeroot  || return 1
+        -hda $TESTDIR/root.ext2 \
+        -hdb $TESTDIR/client.img \
+        -hdc $TESTDIR/iscsidisk2.img \
+        -hdd $TESTDIR/iscsidisk3.img \
+        -m 256M -nographic -net none \
+        -kernel "/boot/vmlinuz-$kernel" \
+        -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
+        -initrd $TESTDIR/initramfs.makeroot  || return 1
     grep -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
     rm $TESTDIR/client.img
     (
-       initdir=$TESTDIR/overlay
-       . $basedir/dracut-functions
-       dracut_install poweroff shutdown
-       inst_hook emergency 000 ./hard-off.sh
-       inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        initdir=$TESTDIR/overlay
+        . $basedir/dracut-functions
+        dracut_install poweroff shutdown
+        inst_hook emergency 000 ./hard-off.sh
+        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
     sudo $basedir/dracut -l -i $TESTDIR/overlay / \
-       -o "plymouth dmraid" \
-       -a "debug" \
-       -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
-       -f $TESTDIR/initramfs.testing $KVERSION || return 1
+        -o "plymouth dmraid" \
+        -a "debug" \
+        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+        -f $TESTDIR/initramfs.testing $KVERSION || return 1
 
     # Make server root
     dd if=/dev/null of=$TESTDIR/server.ext2 bs=1M seek=60
@@ -167,36 +182,36 @@ test_setup() {
 
     kernel=$KVERSION
     (
-       initdir=$TESTDIR/mnt
-       . $basedir/dracut-functions
-       (
-           cd "$initdir";
-           mkdir -p dev sys proc etc var/run tmp var/lib/dhcpd /etc/iscsi
-       )
-       inst /etc/passwd /etc/passwd
-       dracut_install sh ls shutdown poweroff stty cat ps ln ip \
-           dmesg mkdir cp ping \
-           modprobe tcpdump \
-           /etc/services sleep mount chmod
-       dracut_install /usr/sbin/iscsi-target
+        initdir=$TESTDIR/mnt
+        . $basedir/dracut-functions
+        (
+            cd "$initdir";
+            mkdir -p dev sys proc etc var/run tmp var/lib/dhcpd /etc/iscsi
+        )
+        inst /etc/passwd /etc/passwd
+        dracut_install sh ls shutdown poweroff stty cat ps ln ip \
+            dmesg mkdir cp ping \
+            modprobe tcpdump \
+            /etc/services sleep mount chmod
+        dracut_install /usr/sbin/iscsi-target
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
-           [ -f ${_terminfodir}/l/linux ] && break
-       done
-       dracut_install -o ${_terminfodir}/l/linux
-       instmods iscsi_tcp crc32c ipv6
+            [ -f ${_terminfodir}/l/linux ] && break
+        done
+        dracut_install -o ${_terminfodir}/l/linux
+        instmods iscsi_tcp crc32c ipv6
         inst ./targets /etc/iscsi/targets
-       [ -f /etc/netconfig ] && dracut_install /etc/netconfig
-       type -P dhcpd >/dev/null && dracut_install dhcpd
-       [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
-       inst ./server-init /sbin/init
-       inst ./hosts /etc/hosts
-       inst ./dhcpd.conf /etc/dhcpd.conf
-       dracut_install /etc/nsswitch.conf /etc/rpc /etc/protocols
-       inst /etc/group /etc/group
-
-       /sbin/depmod -a -b "$initdir" $kernel
-       cp -a /etc/ld.so.conf* $initdir/etc
-       sudo ldconfig -r "$initdir"
+        [ -f /etc/netconfig ] && dracut_install /etc/netconfig
+        type -P dhcpd >/dev/null && dracut_install dhcpd
+        [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
+        inst ./server-init /sbin/init
+        inst ./hosts /etc/hosts
+        inst ./dhcpd.conf /etc/dhcpd.conf
+        dracut_install /etc/nsswitch.conf /etc/rpc /etc/protocols
+        inst /etc/group /etc/group
+
+        /sbin/depmod -a -b "$initdir" $kernel
+        cp -a /etc/ld.so.conf* $initdir/etc
+        sudo ldconfig -r "$initdir"
     )
 
     sudo umount $TESTDIR/mnt
@@ -204,16 +219,16 @@ test_setup() {
 
     # Make server's dracut image
     $basedir/dracut -l -i $TESTDIR/overlay / \
-       -m "dash udev-rules base rootfs-block debug kernel-modules" \
-       -d "piix ide-gd_mod ata_piix ext2 sd_mod e1000" \
-       -f $TESTDIR/initramfs.server $KVERSION || return 1
+        -m "dash udev-rules base rootfs-block debug kernel-modules" \
+        -d "piix ide-gd_mod ata_piix ext2 sd_mod e1000" \
+        -f $TESTDIR/initramfs.server $KVERSION || return 1
 
 }
 
 test_cleanup() {
     if [[ -s $TESTDIR/server.pid ]]; then
-       sudo kill -TERM $(cat $TESTDIR/server.pid)
-       rm -f $TESTDIR/server.pid
+        sudo kill -TERM $(cat $TESTDIR/server.pid)
+        rm -f $TESTDIR/server.pid
     fi
 }