diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-05-09 12:39:56 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-05-09 12:39:56 +0200 |
| commit | 7be8fb7bfc5c429131521ebc0bbf47ba3a22eb2b (patch) | |
| tree | faef1a4ee6dfd87f77d5bd9459ca79d59d298487 /test/test-functions | |
| parent | d75103d4c68f13ecf3d09234c1506d58e8fae80e (diff) | |
| parent | 62a992bed989cd65a873373af7ab0f2e7de61114 (diff) | |
Merge pull request #3222 from keszybz/tests-work
Some small fixes to make it easier to run tests and fix failure in TEST-{02,08}
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/test-functions b/test/test-functions index b07c500339..e2e07a833c 100644 --- a/test/test-functions +++ b/test/test-functions @@ -64,7 +64,6 @@ run_qemu() { find_qemu_bin || return 1 KERNEL_APPEND="root=/dev/sda1 \ -systemd.log_level=debug \ raid=noautodetect \ loglevel=2 \ init=$ROOTLIBDIR/systemd \ @@ -79,6 +78,7 @@ $KERNEL_APPEND \ -m 512M \ -nographic \ -kernel $KERNEL_BIN \ +-drive format=raw,cache=unsafe,file=${TESTDIR}/rootdisk.img \ " if [[ "$INITRD" && "$SKIP_INITRD" != "yes" ]]; then @@ -93,7 +93,7 @@ $KERNEL_APPEND \ QEMU_BIN="timeout --foreground $QEMU_TIMEOUT $QEMU_BIN" fi ( set -x - $QEMU_BIN $QEMU_OPTIONS -append "$KERNEL_APPEND" $TESTDIR/rootdisk.img ) || return 1 + $QEMU_BIN $QEMU_OPTIONS -append "$KERNEL_APPEND" ) || return 1 } run_nspawn() { @@ -244,6 +244,9 @@ install_systemd() { # we strip binaries since debug symbols increase binaries size a lot # and it could fill the available space strip_binaries + + # enable debug logging in PID1 + echo LogLevel=debug >> $initdir/etc/systemd/system.conf } install_missing_libraries() { @@ -415,6 +418,9 @@ install_pam() { [[ "$LOOKS_LIKE_DEBIAN" ]] && cp /etc/pam.d/systemd-user $initdir/etc/pam.d/ + + # set empty root password for easy debugging + sed -i 's/^root:x:/root::/' $initdir/etc/passwd } install_keymaps() { |