From: Harald Hoyer Date: Wed, 26 Feb 2020 14:17:07 +0000 (+0100) Subject: TEST-20-NFS/test.sh TEST-30-ISCSI/test.sh reduce debug output X-Git-Tag: 050~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53e299e6f4d4e9741d9988f5c2323fd150918d50;p=thirdparty%2Fdracut.git TEST-20-NFS/test.sh TEST-30-ISCSI/test.sh reduce debug output --- diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 69d96f7b7..b9b31f271 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -4,7 +4,10 @@ TEST_DESCRIPTION="root filesystem on NFS" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rd.shell" +DEBUGFAIL="loglevel=1" +#DEBUGFAIL="rd.shell rd.break rd.debug loglevel=7 " +#DEBUGFAIL="rd.debug loglevel=7 " +#SERVER_DEBUG="rd.debug loglevel=7" #SERIAL="tcp:127.0.0.1:9999" run_server() { @@ -22,7 +25,7 @@ run_server() { ${SERIAL:--serial file:"$TESTDIR"/server.log} \ -watchdog i6300esb -watchdog-action poweroff \ -no-reboot \ - -append "panic=1 systemd.crash_reboot rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ + -append "panic=1 quiet root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ -initrd $TESTDIR/initramfs.server \ -pidfile $TESTDIR/server.pid -daemonize || return 1 sudo chmod 644 $TESTDIR/server.pid || return 1 @@ -65,7 +68,7 @@ client_test() { -net socket,connect=127.0.0.1:12320 \ -watchdog i6300esb -watchdog-action poweroff \ -no-reboot \ - -append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet ro console=ttyS0,115200n81 selinux=0" \ + -append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.retry=10 quiet ro console=ttyS0,115200n81 selinux=0" \ -initrd $TESTDIR/initramfs.testing if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nfs-OK $TESTDIR/client.img; then diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index c0239981e..7b1a5348c 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -26,7 +26,7 @@ run_server() { -net nic,macaddr=52:54:00:12:34:57,model=e1000 \ -net socket,listen=127.0.0.1:12330 \ -no-reboot \ - -append "panic=1 systemd.crash_reboot root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \ + -append "panic=1 quiet root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \ -initrd $TESTDIR/initramfs.server \ -pidfile $TESTDIR/server.pid -daemonize || return 1 sudo chmod 644 $TESTDIR/server.pid || return 1