kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

testsuite fixup

master
Harald Hoyer 2013-03-06 17:15:10 +01:00
parent ca36b9b8f8
commit 83691c413f
8 changed files with 168 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/TEST-04-FULL-SYSTEMD/fstab
View File

@ -1,2 +1,2 @@
/dev/sda2 / btrfs defaults 0 0 LABEL=dracut / btrfs subvol=root 0 0
/dev/sdb2 /usr btrfs subvol=usr,ro 0 0 LABEL=dracutusr /usr btrfs subvol=usr,ro 0 0

17
test/TEST-04-FULL-SYSTEMD/test-init.sh
View File

@ -15,16 +15,19 @@ ismounted() {


systemctl --failed --no-legend --no-pager > /failed systemctl --failed --no-legend --no-pager > /failed


if ismounted /usr && [ -f /run/systemd/system/initrd-switch-root.service ] && [ ! -s /failed ]; then if ismounted /usr && [ ! -s /failed ]; then
echo "dracut-root-block-success" >/dev/sdc echo "dracut-root-block-success" >/dev/sdc
fi fi


set -x journalctl --full --no-pager -o short-monotonic
cat /proc/mounts
tree /run if [ -s /failed ]; then
dmesg echo "**************************FAILED**************************"
cat /failed cat /failed
set +x echo "**************************FAILED**************************"
fi

ls -al /run/systemd/system


export TERM=linux export TERM=linux
export PS1='initramfs-test:\w\$ ' export PS1='initramfs-test:\w\$ '

10
test/TEST-04-FULL-SYSTEMD/test.sh
View File

@ -8,7 +8,7 @@ export KVERSION=${KVERSION-$(uname -r)}
#DEBUGFAIL="rd.shell rd.break" #DEBUGFAIL="rd.shell rd.break"
#DEBUGFAIL="rd.shell" #DEBUGFAIL="rd.shell"
#DEBUGOUT="quiet systemd.log_level=debug systemd.log_target=console loglevel=77 rd.info rd.debug" #DEBUGOUT="quiet systemd.log_level=debug systemd.log_target=console loglevel=77 rd.info rd.debug"
DEBUGOUT="loglevel=0 systemd.log_level=debug systemd.log_target=kmsg" DEBUGOUT="loglevel=0 systemd.log_level=debug"
client_run() { client_run() {
local test_name="$1"; shift local test_name="$1"; shift
local client_opts="$*" local client_opts="$*"
@ -83,10 +83,10 @@ test_setup() {
dracut_install grep dracut_install grep
inst_simple ./fstab /etc/fstab inst_simple ./fstab /etc/fstab
rpm -ql systemd | xargs -r $DRACUT_INSTALL ${initdir+-D "$initdir"} -o -a -l rpm -ql systemd | xargs -r $DRACUT_INSTALL ${initdir+-D "$initdir"} -o -a -l
inst /lib/systemd/system/systemd-remount-fs.service
inst /lib/systemd/systemd-remount-fs
inst /lib/systemd/system/systemd-journal-flush.service inst /lib/systemd/system/systemd-journal-flush.service
inst /etc/sysconfig/init inst /etc/sysconfig/init
# activate kmsg import
echo 'ImportKernel=yes' >> $initdir/etc/systemd/journald.conf


# make a journal directory # make a journal directory
mkdir -p $initdir/var/log/journal mkdir -p $initdir/var/log/journal
@ -262,8 +262,8 @@ EOF
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
) )
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-a "debug watchdog systemd" \ -a "debug systemd" \
-o "network" \ -o "dash network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount" \
-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \ -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1 -f $TESTDIR/initramfs.testing $KVERSION || return 1



2
test/TEST-10-RAID/test.sh
View File

@ -39,7 +39,7 @@ test_setup() {
inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup" inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
dracut_install grep dracut_install grep
dracut_install /lib/systemd/systemd-shutdown dracut_install -o /lib/systemd/systemd-shutdown
find_binary plymouth >/dev/null && dracut_install plymouth find_binary plymouth >/dev/null && dracut_install plymouth
cp -a /etc/ld.so.conf* $initdir/etc cp -a /etc/ld.so.conf* $initdir/etc
sudo ldconfig -r "$initdir" sudo ldconfig -r "$initdir"

2
test/TEST-12-RAID-DEG/test.sh
View File

@ -19,7 +19,7 @@ client_run() {
-hdc $TESTDIR/disk2.img.new \ -hdc $TESTDIR/disk2.img.new \
-hdd $TESTDIR/disk3.img.new \ -hdd $TESTDIR/disk3.img.new \
-net none -kernel /boot/vmlinuz-$KVERSION \ -net none -kernel /boot/vmlinuz-$KVERSION \
-append "$* root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \ -append "$* root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
-initrd $TESTDIR/initramfs.testing -initrd $TESTDIR/initramfs.testing
if ! grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then if ! grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
echo "CLIENT TEST END: $@ [FAIL]" echo "CLIENT TEST END: $@ [FAIL]"

2
test/TEST-30-ISCSI/test.sh
View File

@ -161,7 +161,7 @@ test_setup() {
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
) )
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-o "plymouth dmraid" \ -o "dash plymouth dmraid" \
-a "debug" \ -a "debug" \
-d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod" \ -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1 -f $TESTDIR/initramfs.testing $KVERSION || return 1

284
test/TEST-40-NBD/test.sh
View File

@ -18,13 +18,13 @@ run_server() {
-hda $TESTDIR/server.ext2 \ -hda $TESTDIR/server.ext2 \
-hdb $TESTDIR/nbd.ext2 \ -hdb $TESTDIR/nbd.ext2 \
-hdc $TESTDIR/encrypted.ext2 \ -hdc $TESTDIR/encrypted.ext2 \
-m 256M -nographic \ -m 256M -nographic \
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-net socket,listen=127.0.0.1:12340 \ -net socket,listen=127.0.0.1:12340 \
-serial $SERIAL \ -serial $SERIAL \
-kernel /boot/vmlinuz-$KVERSION \ -kernel /boot/vmlinuz-$KVERSION \
-append "root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \ -append "root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1 -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1
sudo chmod 644 $TESTDIR/server.pid || return 1 sudo chmod 644 $TESTDIR/server.pid || return 1


# Cleanup the terminal if we have one # Cleanup the terminal if we have one
@ -49,43 +49,45 @@ client_test() {


# Clear out the flags for each test # Clear out the flags for each test
if ! dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1; then if ! dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1; then
echo "Unable to make client sda image" 1>&2 echo "Unable to make client sda image" 1>&2
return 1 return 1
fi fi

$testdir/run-qemu \ $testdir/run-qemu \
-hda $TESTDIR/flag.img \ -hda $TESTDIR/flag.img \
-m 256M -nographic \ -m 512M \
-net nic,macaddr=$mac,model=e1000 \ -nographic \
-net socket,connect=127.0.0.1:12340 \ -net nic,macaddr=$mac,model=e1000 \
-kernel /boot/vmlinuz-$KVERSION \ -net socket,connect=127.0.0.1:12340 \
-append "$cmdline $DEBUGFAIL rd.debug rd.auto rd.info rd.retry=10 ro quiet console=ttyS0,115200n81 selinux=0" \ -kernel /boot/vmlinuz-$KVERSION \
-initrd $TESTDIR/initramfs.testing -append "$cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \
-initrd $TESTDIR/initramfs.testing


if [[ $? -ne 0 ]] || ! grep -m 1 -q nbd-OK $TESTDIR/flag.img; then if [[ $? -ne 0 ]] || ! grep -m 1 -q nbd-OK $TESTDIR/flag.img; then
echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]" echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
return 1 return 1
fi fi


# nbdinfo=( fstype fsoptions ) # nbdinfo=( fstype fsoptions )
nbdinfo=($(awk '{print $2, $3; exit}' $TESTDIR/flag.img)) nbdinfo=($(awk '{print $2, $3; exit}' $TESTDIR/flag.img))


if [[ "${nbdinfo[0]}" != "$fstype" ]]; then if [[ "${nbdinfo[0]}" != "$fstype" ]]; then
echo "CLIENT TEST END: $test_name [FAILED - WRONG FS TYPE]" echo "CLIENT TEST END: $test_name [FAILED - WRONG FS TYPE] \"${nbdinfo[0]}\" != \"$fstype\""
return 1 return 1
fi fi


opts=${nbdinfo[1]}, opts=${nbdinfo[1]},
while [[ $opts ]]; do while [[ $opts ]]; do
if [[ ${opts%%,*} = $fsopt ]]; then if [[ ${opts%%,*} = $fsopt ]]; then
found=1 found=1
break break
fi fi
opts=${opts#*,} opts=${opts#*,}
done done


if [[ ! $found ]]; then if [[ ! $found ]]; then
echo "CLIENT TEST END: $test_name [FAILED - BAD FS OPTS]" echo "CLIENT TEST END: $test_name [FAILED - BAD FS OPTS] \"${nbdinfo[1]}\" != \"$fsopt\""
return 1 return 1
fi fi


echo "CLIENT TEST END: $test_name [OK]" echo "CLIENT TEST END: $test_name [OK]"
@ -94,89 +96,90 @@ client_test() {
test_run() { test_run() {
modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; exit 1; } modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; exit 1; }
if ! run_server; then if ! run_server; then
echo "Failed to start server" 1>&2 echo "Failed to start server" 1>&2
return 1 return 1
fi fi
client_run || { kill_server; return 1; } client_run || { kill_server; return 1; }
} }


client_run() { client_run() {

# The default is ext3,errors=continue so use that to determine # The default is ext3,errors=continue so use that to determine
# if our options were parsed and used # if our options were parsed and used
client_test "NBD root=nbd:IP:port::fsopts" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000::errors=panic rd.luks=0" \
ext3 errors=panic || return 1

client_test "NBD root=nbd:IP:port" 52:54:00:12:34:00 \ client_test "NBD root=nbd:IP:port" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000" || return 1 "root=nbd:192.168.50.1:2000 rd.luks=0" || return 1


client_test "NBD root=nbd:IP:port:fstype" 52:54:00:12:34:00 \ client_test "NBD root=nbd:IP:port:fstype" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000:ext2" ext2 || return 1 "root=nbd:192.168.50.1:2000:ext2 rd.luks=0" ext2 || return 1

client_test "NBD root=nbd:IP:port::fsopts" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000::errors=panic" \
ext3 errors=panic || return 1


client_test "NBD root=nbd:IP:port:fstype:fsopts" 52:54:00:12:34:00 \ client_test "NBD root=nbd:IP:port:fstype:fsopts" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000:ext2:errors=panic" \ "root=nbd:192.168.50.1:2000:ext2:errors=panic rd.luks=0" \
ext2 errors=panic || return 1 ext2 errors=panic || return 1


client_test "NBD Bridge root=nbd:IP:port:fstype:fsopts" 52:54:00:12:34:00 \ client_test "NBD Bridge root=nbd:IP:port:fstype:fsopts" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000:ext2:errors=panic bridge" \ "root=nbd:192.168.50.1:2000:ext2:errors=panic bridge rd.luks=0" \
ext2 errors=panic || return 1 ext2 errors=panic || return 1


# There doesn't seem to be a good way to validate the NBD options, so # There doesn't seem to be a good way to validate the NBD options, so
# just check that we don't screw up the other options # just check that we don't screw up the other options


client_test "NBD root=nbd:IP:port:::NBD opts" 52:54:00:12:34:00 \ client_test "NBD root=nbd:IP:port:::NBD opts" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000:::bs=2048" || return 1 "root=nbd:192.168.50.1:2000:::bs=2048 rd.luks=0" || return 1


client_test "NBD root=nbd:IP:port:fstype::NBD opts" 52:54:00:12:34:00 \ client_test "NBD root=nbd:IP:port:fstype::NBD opts" 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000:ext2::bs=2048" ext2 || return 1 "root=nbd:192.168.50.1:2000:ext2::bs=2048 rd.luks=0" ext2 || return 1


client_test "NBD root=nbd:IP:port:fstype:fsopts:NBD opts" \ client_test "NBD root=nbd:IP:port:fstype:fsopts:NBD opts" \
52:54:00:12:34:00 \ 52:54:00:12:34:00 \
"root=nbd:192.168.50.1:2000:ext2:errors=panic:bs=2048" \ "root=nbd:192.168.50.1:2000:ext2:errors=panic:bs=2048 rd.luks=0" \
ext2 errors=panic || return 1 ext2 errors=panic || return 1


# DHCP root-path parsing # DHCP root-path parsing


client_test "NBD root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \ client_test "NBD root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \
"root=dhcp" || return 1 "root=dhcp rd.luks=0" || return 1


client_test "NBD Bridge root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \ client_test "NBD Bridge root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \
"root=dhcp bridge" || return 1 "root=dhcp bridge rd.luks=0" || return 1


client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype" \ client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype" \
52:54:00:12:34:02 "root=dhcp" ext2 || return 1 52:54:00:12:34:02 "root=dhcp rd.luks=0" ext2 || return 1


client_test "NBD root=dhcp DHCP root-path nbd:srv:port::fsopts" \ client_test "NBD root=dhcp DHCP root-path nbd:srv:port::fsopts" \
52:54:00:12:34:03 "root=dhcp" ext3 errors=panic || return 1 52:54:00:12:34:03 "root=dhcp rd.luks=0" ext3 errors=panic || return 1


client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \ client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \
52:54:00:12:34:04 "root=dhcp" ext2 errors=panic || return 1 52:54:00:12:34:04 "root=dhcp rd.luks=0" ext2 errors=panic || return 1


# netroot handling # netroot handling


client_test "NBD netroot=nbd:IP:port" 52:54:00:12:34:00 \ client_test "NBD netroot=nbd:IP:port" 52:54:00:12:34:00 \
"netroot=nbd:192.168.50.1:2000" || return 1 "netroot=nbd:192.168.50.1:2000 rd.luks=0" || return 1


client_test "NBD netroot=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \ client_test "NBD netroot=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \
52:54:00:12:34:04 "netroot=dhcp" ext2 errors=panic || return 1 52:54:00:12:34:04 "netroot=dhcp rd.luks=0" ext2 errors=panic || return 1


# Encrypted root handling via LVM/LUKS over NBD # Encrypted root handling via LVM/LUKS over NBD


. $TESTDIR/luks.uuid

client_test "NBD root=/dev/dracut/root netroot=nbd:IP:port" \ client_test "NBD root=/dev/dracut/root netroot=nbd:IP:port" \
52:54:00:12:34:00 \ 52:54:00:12:34:00 \
"root=/dev/dracut/root netroot=nbd:192.168.50.1:2001" || return 1 "root=/dev/dracut/root rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=nbd:192.168.50.1:2001" || return 1


# XXX This should be ext2,errors=panic but that doesn't currently # XXX This should be ext2,errors=panic but that doesn't currently
# XXX work when you have a real root= line in addition to netroot= # XXX work when you have a real root= line in addition to netroot=
# XXX How we should work here needs clarification # XXX How we should work here needs clarification
client_test "NBD root=/dev/dracut/root netroot=dhcp (w/ fstype and opts)" \ client_test "NBD root=/dev/dracut/root netroot=dhcp (w/ fstype and opts)" \
52:54:00:12:34:05 \ 52:54:00:12:34:05 \
"root=/dev/dracut/root netroot=dhcp" || return 1 "root=/dev/dracut/root rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=dhcp" || return 1


if [[ -s server.pid ]]; then if [[ -s server.pid ]]; then
sudo kill -TERM $(cat $TESTDIR/server.pid) sudo kill -TERM $(cat $TESTDIR/server.pid)
rm -f $TESTDIR/server.pid rm -f $TESTDIR/server.pid
fi fi


} }
@ -189,39 +192,39 @@ make_encrypted_root() {
kernel=$KVERSION kernel=$KVERSION
# Create what will eventually be our root filesystem onto an overlay # Create what will eventually be our root filesystem onto an overlay
( (
export initdir=$TESTDIR/overlay/source export initdir=$TESTDIR/overlay/source
. $basedir/dracut-functions.sh . $basedir/dracut-functions.sh
mkdir -p "$initdir" mkdir -p "$initdir"
(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
dracut_install sh df free ls shutdown poweroff stty cat ps ln ip \ dracut_install sh df free ls shutdown poweroff stty cat ps ln ip \
mount dmesg mkdir cp ping mount dmesg mkdir cp ping
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
[ -f ${_terminfodir}/l/linux ] && break [ -f ${_terminfodir}/l/linux ] && break
done done
dracut_install -o ${_terminfodir}/l/linux dracut_install -o ${_terminfodir}/l/linux
inst ./client-init.sh /sbin/init inst ./client-init.sh /sbin/init
find_binary plymouth >/dev/null && dracut_install plymouth find_binary plymouth >/dev/null && dracut_install plymouth
cp -a /etc/ld.so.conf* $initdir/etc cp -a /etc/ld.so.conf* $initdir/etc
sudo ldconfig -r "$initdir" sudo ldconfig -r "$initdir"
) )


# second, install the files needed to make the root filesystem # second, install the files needed to make the root filesystem
( (
export initdir=$TESTDIR/overlay export initdir=$TESTDIR/overlay
. $basedir/dracut-functions.sh . $basedir/dracut-functions.sh
dracut_install mke2fs poweroff cp umount tune2fs dracut_install mke2fs poweroff cp umount tune2fs
inst_hook initqueue 01 ./create-root.sh inst_hook initqueue 01 ./create-root.sh
inst_hook initqueue/finished 01 ./finished-false.sh inst_hook initqueue/finished 01 ./finished-false.sh
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
) )


# create an initramfs that will create the target root filesystem. # 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 # We do it this way so that we do not risk trashing the host mdraid
# devices, volume groups, encrypted partitions, etc. # devices, volume groups, encrypted partitions, etc.
$basedir/dracut.sh -l -i $TESTDIR/overlay / \ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
-d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \ -d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1 -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
rm -rf $TESTDIR/overlay rm -rf $TESTDIR/overlay


# Invoke KVM and/or QEMU to actually create the target filesystem. # Invoke KVM and/or QEMU to actually create the target filesystem.
@ -229,10 +232,10 @@ make_encrypted_root() {
-hda $TESTDIR/flag.img \ -hda $TESTDIR/flag.img \
-hdb $TESTDIR/encrypted.ext2 \ -hdb $TESTDIR/encrypted.ext2 \
-m 256M \ -m 256M \
-nographic -net none \ -nographic -net none \
-kernel "/boot/vmlinuz-$kernel" \ -kernel "/boot/vmlinuz-$kernel" \
-append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0" \ -append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.makeroot || return 1 -initrd $TESTDIR/initramfs.makeroot || return 1
grep -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1 grep -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
grep -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid grep -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid
} }
@ -245,26 +248,26 @@ make_client_root() {


kernel=$KVERSION kernel=$KVERSION
( (
export initdir=$TESTDIR/mnt export initdir=$TESTDIR/mnt
. $basedir/dracut-functions.sh . $basedir/dracut-functions.sh
mkdir -p "$initdir" mkdir -p "$initdir"
(cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
dracut_install sh ls shutdown poweroff stty cat ps ln ip \ dracut_install sh ls shutdown poweroff stty cat ps ln ip \
dmesg mkdir cp ping dmesg mkdir cp ping
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
[ -f ${_terminfodir}/l/linux ] && break [ -f ${_terminfodir}/l/linux ] && break
done done
dracut_install -o ${_terminfodir}/l/linux dracut_install -o ${_terminfodir}/l/linux
inst ./client-init.sh /sbin/init inst ./client-init.sh /sbin/init
inst /etc/nsswitch.conf /etc/nsswitch.conf inst /etc/nsswitch.conf /etc/nsswitch.conf
inst /etc/passwd /etc/passwd inst /etc/passwd /etc/passwd
inst /etc/group /etc/group inst /etc/group /etc/group
for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do
[ -e "$i" ] || continue [ -e "$i" ] || continue
inst $i inst $i
done done
cp -a /etc/ld.so.conf* $initdir/etc cp -a /etc/ld.so.conf* $initdir/etc
sudo ldconfig -r "$initdir" sudo ldconfig -r "$initdir"
) )


sudo umount $TESTDIR/mnt sudo umount $TESTDIR/mnt
@ -279,36 +282,36 @@ make_server_root() {


kernel=$KVERSION kernel=$KVERSION
( (
export initdir=$TESTDIR/mnt export initdir=$TESTDIR/mnt
. $basedir/dracut-functions.sh . $basedir/dracut-functions.sh
mkdir -p "$initdir" mkdir -p "$initdir"
( (
cd "$initdir"; cd "$initdir";
mkdir -p dev sys proc etc var/run var/lib/dhcpd tmp mkdir -p dev sys proc etc var/run var/lib/dhcpd tmp
) )
dracut_install sh ls shutdown poweroff stty cat ps ln ip \ dracut_install sh ls shutdown poweroff stty cat ps ln ip \
dmesg mkdir cp ping grep \ dmesg mkdir cp ping grep \
sleep nbd-server chmod sleep nbd-server chmod
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
[ -f ${_terminfodir}/l/linux ] && break [ -f ${_terminfodir}/l/linux ] && break
done done
dracut_install -o ${_terminfodir}/l/linux dracut_install -o ${_terminfodir}/l/linux
instmods af_packet instmods af_packet
type -P dhcpd >/dev/null && dracut_install dhcpd type -P dhcpd >/dev/null && dracut_install dhcpd
[ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
inst ./server-init.sh /sbin/init inst ./server-init.sh /sbin/init
inst ./hosts /etc/hosts inst ./hosts /etc/hosts
inst ./dhcpd.conf /etc/dhcpd.conf inst ./dhcpd.conf /etc/dhcpd.conf
inst /etc/nsswitch.conf /etc/nsswitch.conf inst /etc/nsswitch.conf /etc/nsswitch.conf
inst /etc/passwd /etc/passwd inst /etc/passwd /etc/passwd
inst /etc/group /etc/group inst /etc/group /etc/group
for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do
[ -e "$i" ] || continue [ -e "$i" ] || continue
inst $i inst $i
done done


cp -a /etc/ld.so.conf* $initdir/etc cp -a /etc/ld.so.conf* $initdir/etc
sudo ldconfig -r "$initdir" sudo ldconfig -r "$initdir"
) )


sudo umount $TESTDIR/mnt sudo umount $TESTDIR/mnt
@ -325,34 +328,39 @@ test_setup() {


# Make the test image # Make the test image
( (
export initdir=$TESTDIR/overlay export initdir=$TESTDIR/overlay
. $basedir/dracut-functions.sh . $basedir/dracut-functions.sh
dracut_install poweroff shutdown dracut_install poweroff shutdown
inst_hook emergency 000 ./hard-off.sh inst_hook emergency 000 ./hard-off.sh
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
inst ./cryptroot-ask.sh /sbin/cryptroot-ask inst ./cryptroot-ask.sh /sbin/cryptroot-ask

# inst ./debug-shell.service /lib/systemd/system/debug-shell.service
# mkdir -p "${initdir}/lib/systemd/system/sysinit.target.wants"
# ln -fs ../debug-shell.service "${initdir}/lib/systemd/system/sysinit.target.wants/debug-shell.service"

. $TESTDIR/luks.uuid . $TESTDIR/luks.uuid
mkdir -p $initdir/etc mkdir -p $initdir/etc
echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > $initdir/etc/crypttab echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > $initdir/etc/crypttab
echo -n test > $initdir/etc/key echo -n test > $initdir/etc/key
) )


sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-m "dash udev-rules rootfs-block base debug kernel-modules" \ -m "dash udev-rules rootfs-block base debug kernel-modules" \
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \ -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \
-f $TESTDIR/initramfs.server $KVERSION || return 1 -f $TESTDIR/initramfs.server $KVERSION || return 1


sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-o "plymouth" \ -o "plymouth" \
-a "debug watchdog" \ -a "debug watchdog" \
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esbwdt" \ -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esbwdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1 -f $TESTDIR/initramfs.testing $KVERSION || return 1
} }


kill_server() { kill_server() {
if [[ -s $TESTDIR/server.pid ]]; then if [[ -s $TESTDIR/server.pid ]]; then
sudo kill -TERM $(cat $TESTDIR/server.pid) sudo kill -TERM $(cat $TESTDIR/server.pid)
rm -f $TESTDIR/server.pid rm -f $TESTDIR/server.pid
fi fi
} }



4
test/TEST-50-MULTINIC/test.sh
View File

@ -24,7 +24,7 @@ run_server() {
-serial $SERIAL \ -serial $SERIAL \
-watchdog i6300esb -watchdog-action poweroff \ -watchdog i6300esb -watchdog-action poweroff \
-kernel /boot/vmlinuz-$KVERSION \ -kernel /boot/vmlinuz-$KVERSION \
-append "rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ -append "loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.server \ -initrd $TESTDIR/initramfs.server \
-pidfile $TESTDIR/server.pid -daemonize || return 1 -pidfile $TESTDIR/server.pid -daemonize || return 1
sudo chmod 644 $TESTDIR/server.pid || return 1 sudo chmod 644 $TESTDIR/server.pid || return 1
@ -61,7 +61,7 @@ client_test() {
-net nic,netdev=net2,macaddr=52:54:00:12:34:$mac3,model=e1000 \ -net nic,netdev=net2,macaddr=52:54:00:12:34:$mac3,model=e1000 \
-watchdog i6300esb -watchdog-action poweroff \ -watchdog i6300esb -watchdog-action poweroff \
-kernel /boot/vmlinuz-$KVERSION \ -kernel /boot/vmlinuz-$KVERSION \
-append "$cmdline $DEBUGFAIL rd.retry=5 rd.debug rd.info ro rd.systemd.log_level=debug console=ttyS0,115200n81 selinux=0 rd.copystate rd.chroot init=/sbin/init" \ -append "$cmdline $DEBUGFAIL rd.retry=5 rd.info ro rd.systemd.log_level=debug console=ttyS0,115200n81 selinux=0 rd.copystate rd.chroot init=/sbin/init" \
-initrd $TESTDIR/initramfs.testing -initrd $TESTDIR/initramfs.testing


if [[ $? -ne 0 ]] || ! grep -m 1 -q OK $TESTDIR/client.img; then if [[ $? -ne 0 ]] || ! grep -m 1 -q OK $TESTDIR/client.img; then