X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2FTEST-01-BASIC%2Ftest.sh;h=06b80c2a154238232787257aa1c115651bba692b;hp=c84fb668b43f79b651a13e31046f030be6880dc2;hb=5fa594df8de6fed8e18146096a7b7d45b2187441;hpb=6b197f2a03fa03a2a853cf726d47be2ea4c623b6 diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index c84fb668b..06b80c2a1 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -4,46 +4,88 @@ TEST_DESCRIPTION="Basic systemd setup" KVERSION=${KVERSION-$(uname -r)} +KERNEL_VER=$(uname -r) # Uncomment this to debug failures #DEBUGFAIL="systemd.unit=multi-user.target" +DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort" -test_run() { +run_qemu() { + # TODO: qemu wrapper script: http://www.spinics.net/lists/kvm/msg72389.html qemu-kvm \ -hda $TESTDIR/rootdisk.img \ - -m 256M -nographic \ - -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/sda1 systemd.log_level=debug raid=noautodetect loglevel=2 init=/usr/lib/systemd/systemd rw console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" + -m 512M -nographic \ + -net none -kernel /boot/vmlinuz-$KERNEL_VER \ + -append "root=/dev/sda1 systemd.log_level=debug raid=noautodetect loglevel=2 init=/usr/lib/systemd/systemd ro console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" || return 1 + ret=1 mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root [[ -e $TESTDIR/root/testok ]] && ret=0 - cp -a $TESTDIR/root/var/log/journal $TESTDIR cp -a $TESTDIR/root/failed $TESTDIR + cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile + mount /dev/mapper/varcrypt $TESTDIR/root/var + cp -a $TESTDIR/root/var/log/journal $TESTDIR + umount $TESTDIR/root/var umount $TESTDIR/root + cryptsetup luksClose /dev/mapper/varcrypt + cat $TESTDIR/failed + ls -l $TESTDIR/journal/*/*.journal + test -s $TESTDIR/failed && ret=$(($ret+1)) + return $ret +} + + +run_nspawn() { + systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd + ret=1 + [[ -e $TESTDIR/nspawn-root/testok ]] && ret=0 + cp -a $TESTDIR/nspawn-root/var/log/journal $TESTDIR + cp -a $TESTDIR/nspawn-root/failed $TESTDIR cat $TESTDIR/failed ls -l $TESTDIR/journal/*/*.journal test -s $TESTDIR/failed && ret=$(($ret+1)) return $ret } + +test_run() { + if check_qemu ; then + run_qemu || return 1 + else + dwarn "can't run qemu-kvm, skipping" + fi + if check_nspawn; then + run_nspawn || return 1 + else + dwarn "can't run systemd-nspawn, skipping" + fi + return 0 +} + test_setup() { rm -f $TESTDIR/rootdisk.img # Create the blank file to use as a root filesystem - dd if=/dev/null of=$TESTDIR/rootdisk.img bs=1M seek=100 + dd if=/dev/null of=$TESTDIR/rootdisk.img bs=1M seek=200 LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img) [ -b $LOOPDEV ] || return 1 echo "LOOPDEV=$LOOPDEV" >> $STATEFILE - sfdisk -C 3200 -H 2 -S 32 -L $LOOPDEV <$TESTDIR/keyfile + cryptsetup -q luksFormat ${LOOPDEV}p2 $TESTDIR/keyfile + cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile + mkfs.ext3 -L var /dev/mapper/varcrypt mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root mkdir -p $TESTDIR/root/run + mkdir -p $TESTDIR/root/var + mount /dev/mapper/varcrypt $TESTDIR/root/var - kernel=$KVERSION # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 @@ -55,6 +97,9 @@ EOF # install compiled files (cd ../..; make DESTDIR=$initdir install) + # remove unneeded documentation + rm -fr $initdir/usr/share/{man,doc,gtk-doc} + # install possible missing libraries for i in $initdir/{sbin,bin}/* $initdir/lib/systemd/*; do inst_libs $i @@ -79,10 +124,25 @@ EOF inst /etc/localtime # we want an empty environment > $initdir/etc/environment + > $initdir/etc/machine-id # set the hostname echo systemd-testsuite > $initdir/etc/hostname + eval $(udevadm info --export --query=env --name=/dev/mapper/varcrypt) + eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) + + cat >$initdir/etc/crypttab < $initdir/etc/varkey + cat $initdir/etc/crypttab | ddebug + + cat >$initdir/etc/fstab <$initdir/etc/systemd/system/testsuite.target < /failed ; echo OK > /testok' -ExecStartPost=/usr/sbin/poweroff +ExecStart=/bin/bash -c 'set -x; systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok; while : ;do systemd-cat echo "testsuite service waiting for /var/log/journal" ; echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;' +ExecStopPost=/usr/bin/systemctl poweroff Type=oneshot - EOF mkdir -p $initdir/etc/systemd/system/testsuite.target.wants ln -fs ../testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service @@ -118,7 +177,16 @@ EOF chmod 0755 $initdir/etc/rc.d/rc.local # install basic tools needed dracut_install sh bash setsid loadkeys setfont \ - login sushell sulogin gzip sleep echo + login sushell sulogin gzip sleep echo mount umount cryptsetup + dracut_install dmsetup modprobe + + instmods dm_crypt =crypto + + type -P dmeventd >/dev/null && dracut_install dmeventd + + inst_libdir_file "libdevmapper-event.so*" + + inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules # install libnss_files for login inst_libdir_file "libnss_files*" @@ -165,30 +233,49 @@ EOF done # install plymouth, if found... else remove plymouth service files - if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then - PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$TEST_BASE_DIR/test-functions" \ - /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir - dracut_install plymouth plymouthd - else - rm -f $initdir/usr/lib/systemd/system/plymouth* $initdir/usr/lib/systemd/system/*/plymouth* - fi + # if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then + # PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$TEST_BASE_DIR/test-functions" \ + # /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir + # dracut_install plymouth plymouthd + # else + rm -f $initdir/{usr/lib,etc}/systemd/system/plymouth* $initdir/{usr/lib,etc}/systemd/system/*/plymouth* + # fi # some helper tools for debugging - dracut_install sh df free ls shutdown poweroff \ - stty cat ps ln ip route \ - mount dmesg dhclient mkdir cp ping dhclient \ - umount strace less grep id tty touch + [[ $DEBUGTOOLS ]] && dracut_install $DEBUGTOOLS # install ld.so.conf* and run ldconfig cp -a /etc/ld.so.conf* $initdir/etc ldconfig -r "$initdir" - + ddebug "Strip binaeries" + find "$initdir" -perm +111 -type f | xargs strip --strip-unneeded | ddebug + + # copy depmod files + inst /lib/modules/$KERNEL_VER/modules.order + inst /lib/modules/$KERNEL_VER/modules.builtin + # generate module dependencies + if [[ -d $initdir/lib/modules/$KERNEL_VER ]] && \ + ! depmod -a -b "$initdir" $KERNEL_VER; then + dfatal "\"depmod -a $KERNEL_VER\" failed." + exit 1 + fi ) + rm -fr $TESTDIR/nspawn-root + ddebug "cp -ar $TESTDIR/root $TESTDIR/nspawn-root" + cp -ar $TESTDIR/root $TESTDIR/nspawn-root + # we don't mount in the nspawn root + rm -fr $TESTDIR/nspawn-root/etc/fstab + + ddebug "umount $TESTDIR/root/var" + umount $TESTDIR/root/var + cryptsetup luksClose /dev/mapper/varcrypt + ddebug "umount $TESTDIR/root" umount $TESTDIR/root - } test_cleanup() { + umount $TESTDIR/root/var 2>/dev/null + [[ -b /dev/mapper/varcrypt ]] && cryptsetup luksClose /dev/mapper/varcrypt umount $TESTDIR/root 2>/dev/null [[ $LOOPDEV ]] && losetup -d $LOOPDEV return 0