X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2FTEST-01-BASIC%2Ftest.sh;h=eb6a80a07c8e1737548101041894093af4c83e63;hb=1edefa4f1d7bae6cc19aa4a97238400c5a04f7a4;hp=ca8a5ee87202bc057c72684c8f5ec17680f4f52b;hpb=d9890f4ed47c0d565915360d8bae3b7a1428f285;p=elogind.git diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index ca8a5ee87..eb6a80a07 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -4,22 +4,26 @@ 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" 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 + cp -a $TESTDIR/root/var/log/journal $TESTDIR umount $TESTDIR/root cat $TESTDIR/failed ls -l $TESTDIR/journal/*/*.journal @@ -29,11 +33,11 @@ run_qemu() { run_nspawn() { - systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd + systemd-nspawn -b -D $TESTDIR/nspawn-root --capability=CAP_AUDIT_CONTROL,CAP_AUDIT_WRITE /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 + cp -a $TESTDIR/nspawn-root/var/log/journal $TESTDIR cat $TESTDIR/failed ls -l $TESTDIR/journal/*/*.journal test -s $TESTDIR/failed && ret=$(($ret+1)) @@ -42,28 +46,37 @@ run_nspawn() { test_run() { - run_qemu || return 1 - run_nspawn || return 1 + 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 mkdir -p $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root mkdir -p $TESTDIR/root/run - kernel=$KVERSION # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 @@ -75,14 +88,14 @@ 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 done - # activate kmsg import - echo 'ImportKernel=yes' >> $initdir/etc/systemd/journald.conf - # make a journal directory mkdir -p $initdir/var/log/journal @@ -99,10 +112,17 @@ 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=${LOOPDEV}p2) + + 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 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 @@ -138,7 +157,8 @@ 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 # install libnss_files for login inst_libdir_file "libnss_files*" @@ -185,28 +205,40 @@ 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 - cp -avr $TESTDIR/root $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" umount $TESTDIR/root }