test: simplify tty handling

diff --git a/test/TEST-60-NFS/server-init.sh b/test/TEST-60-NFS/server-init.sh
index 0c06eea11d05f8855c19f8977b9a645d83443dba..d70bc8099aee16d60626c55485dda92e1c700574 100755 (executable)
--- a/test/TEST-60-NFS/server-init.sh
+++ b/test/TEST-60-NFS/server-init.sh
@@ -5,7 +5,6 @@ export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export TERM=linux
 export PS1='nfstest-server:\w\$ '
 : > /dev/watchdog
-stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
 

diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
index b800f3890811d0883b5097e2f46c93fc48ee9a8d..ffdedf7aab31746df0f623c2f58c3be869ea404f 100755 (executable)
--- a/test/TEST-60-NFS/test.sh
+++ b/test/TEST-60-NFS/test.sh
@@ -35,9 +35,6 @@ run_server() {
         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
     chmod 644 "$TESTDIR"/server.pid || return 1
 
-    # Cleanup the terminal if we have one
-    tty -s && stty sane
-
     if ! [[ $SERIAL ]]; then
         wait_for_server_startup || return 1
     else
@@ -245,7 +242,7 @@ test_setup() {
             chmod 777 var/lib/rpcbind var/lib/nfs
         )
 
-        inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
+        inst_multiple sh ls shutdown poweroff cat ps ln ip \
             dmesg mkdir cp exportfs \
             modprobe rpc.nfsd rpc.mountd \
             sleep mount chmod rm
@@ -304,7 +301,7 @@ test_setup() {
             echo "TEST FETCH FILE" > root/fetchfile
         )
 
-        inst_multiple sh shutdown poweroff stty cat ps ln ip dd \
+        inst_multiple sh shutdown poweroff cat ps ln ip dd \
             mount dmesg mkdir cp grep setsid ls cat sync
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             if [ -f "${_terminfodir}"/l/linux ]; then

diff --git a/test/TEST-61-MULTINIC/server-init.sh b/test/TEST-61-MULTINIC/server-init.sh
index d3c8a422c960d37674a527bca0d26d6ed5cf71d2..a881b41a9cbf3b8bdd45c7c7999d16091e283802 100755 (executable)
--- a/test/TEST-61-MULTINIC/server-init.sh
+++ b/test/TEST-61-MULTINIC/server-init.sh
@@ -5,7 +5,6 @@ export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export TERM=linux
 export PS1='nfstest-server:\w\$ '
 : > /dev/watchdog
-stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
 

diff --git a/test/TEST-61-MULTINIC/test.sh b/test/TEST-61-MULTINIC/test.sh
index a2f5f6b11d30bd0b08419f461689fda2bc457591..52eae65181d6a706b730e82744b23bd2f628b7ce 100755 (executable)
--- a/test/TEST-61-MULTINIC/test.sh
+++ b/test/TEST-61-MULTINIC/test.sh
@@ -41,9 +41,6 @@ run_server() {
 
     chmod 644 -- "$TESTDIR"/server.pid || return 1
 
-    # Cleanup the terminal if we have one
-    tty -s && stty sane
-
     if ! [[ $SERIAL ]]; then
         wait_for_server_startup || return 1
     else
@@ -196,7 +193,7 @@ test_setup() {
             chmod 777 var/lib/rpcbind var/lib/nfs
         )
 
-        inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
+        inst_multiple sh ls shutdown poweroff cat ps ln ip \
             dmesg mkdir cp exportfs \
             modprobe rpc.nfsd rpc.mountd \
             sleep mount chmod rm
@@ -253,7 +250,7 @@ test_setup() {
             mkdir -p dev sys proc etc run root usr var/lib/nfs/rpc_pipefs
         )
 
-        inst_multiple sh shutdown poweroff stty cat ps ln ip dd \
+        inst_multiple sh shutdown poweroff cat ps ln ip dd \
             mount dmesg mkdir cp grep setsid ls cat sync
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             if [ -f "${_terminfodir}"/l/linux ]; then

diff --git a/test/TEST-62-BONDBRIDGEVLAN/client-init.sh b/test/TEST-62-BONDBRIDGEVLAN/client-init.sh
index b1d1db4e27abeaf869e431298b5e6d62e24f175e..2bd71ac12a7dcca352cb83f7ea169995f7ff1e97 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/client-init.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/client-init.sh
@@ -5,7 +5,6 @@ strstr() { [ "${1#*"$2"*}" != "$1" ]; }
 CMDLINE=$(while read -r line; do echo "$line"; done < /proc/cmdline)
 export TERM=linux
 export PS1='initramfs-test:\w\$ '
-stty sane
 echo "made it to the rootfs! Powering down."
 
 testnum=$(grep -Eo "rd.dracut.test.num=[^[:space:]]+" /proc/cmdline | sed -nr 's/.*=(.*)/\1/p')

diff --git a/test/TEST-62-BONDBRIDGEVLAN/server-init.sh b/test/TEST-62-BONDBRIDGEVLAN/server-init.sh
index 964f11082ff677691eb0b50985ddf766b91de0a6..b740937bdb61d7886bc2ac316b5a090df3fcc394 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/server-init.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/server-init.sh
@@ -4,7 +4,6 @@ set -x
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export TERM=linux
 export PS1='nfstest-server:\w\$ '
-stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
 

diff --git a/test/TEST-62-BONDBRIDGEVLAN/test.sh b/test/TEST-62-BONDBRIDGEVLAN/test.sh
index 87a23886fbcc507907d03e9b7489d5155fe8029d..5bcbb574f4e73637f7dfbe4b11376873592ba75e 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/test.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/test.sh
@@ -63,9 +63,6 @@ run_server() {
         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
     chmod 644 -- "$TESTDIR"/server.pid || return 1
 
-    # Cleanup the terminal if we have one
-    tty -s && stty sane
-
     if ! [[ $SERIAL ]]; then
         wait_for_server_startup || return 1
     else
@@ -245,7 +242,7 @@ test_setup() {
             [[ -f $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
         done
 
-        inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
+        inst_multiple sh ls shutdown poweroff cat ps ln ip \
             dmesg mkdir cp ping exportfs \
             modprobe rpc.nfsd rpc.mountd \
             /etc/services sleep mount chmod
@@ -295,7 +292,7 @@ test_setup() {
         export initdir=$TESTDIR/overlay/source/nfs/client
         # shellcheck disable=SC1090
         . "$PKGLIBDIR"/dracut-init.sh
-        inst_multiple sh shutdown poweroff stty cat ps ln ip \
+        inst_multiple sh shutdown poweroff cat ps ln ip \
             mount dmesg mkdir cp ping grep ls sort dd sed basename
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [[ -f ${_terminfodir}/l/linux ]] && break

diff --git a/test/TEST-70-ISCSI/server-init.sh b/test/TEST-70-ISCSI/server-init.sh
index f89464eb411126397c0745386d6b6442d28d7462..0984a0c64181a07f26c204b12b4c7ecee2b9cfd5 100755 (executable)
--- a/test/TEST-70-ISCSI/server-init.sh
+++ b/test/TEST-70-ISCSI/server-init.sh
@@ -4,7 +4,6 @@ set -x
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export TERM=linux
 export PS1='server:\w\$ '
-stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
 

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index f509192fb56ac9e1cba07a8d2c5de19511614e09..ee7b3d126e226fa97ed2a005b6ee7450624a68b3 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -29,9 +29,6 @@ run_server() {
         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
     chmod 644 "$TESTDIR"/server.pid || return 1
 
-    # Cleanup the terminal if we have one
-    tty -s && stty sane
-
     if ! [[ $SERIAL ]]; then
         wait_for_server_startup || return 1
     else

diff --git a/test/TEST-71-ISCSI-MULTI/server-init.sh b/test/TEST-71-ISCSI-MULTI/server-init.sh
index f89464eb411126397c0745386d6b6442d28d7462..0984a0c64181a07f26c204b12b4c7ecee2b9cfd5 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/server-init.sh
+++ b/test/TEST-71-ISCSI-MULTI/server-init.sh
@@ -4,7 +4,6 @@ set -x
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export TERM=linux
 export PS1='server:\w\$ '
-stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
 

diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
index 7603d611a995318e701a67cd7b1eea15fc862b19..3447abd974d7d166a3247325868c255bb11cf075 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/test.sh
+++ b/test/TEST-71-ISCSI-MULTI/test.sh
@@ -29,9 +29,6 @@ run_server() {
         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
     chmod 644 "$TESTDIR"/server.pid || return 1
 
-    # Cleanup the terminal if we have one
-    tty -s && stty sane
-
     if ! [[ $SERIAL ]]; then
         wait_for_server_startup || return 1
     else

diff --git a/test/TEST-72-NBD/server-init.sh b/test/TEST-72-NBD/server-init.sh
index bc52b2e662aa08ac588af8008eb25ae4e6995ac9..ec21c199d5a45e7204c7fd68be681f8b1a8696f7 100755 (executable)
--- a/test/TEST-72-NBD/server-init.sh
+++ b/test/TEST-72-NBD/server-init.sh
@@ -4,7 +4,6 @@ set -x
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 export TERM=linux
 export PS1='nbdtest-server:\w\$ '
-stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
 

diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
index abfeb84407d45ef3ad50aa93703be3d92ad39718..0ec1fa20ab4eac65bdccf19a651ab0ec6f41dcae 100755 (executable)
--- a/test/TEST-72-NBD/test.sh
+++ b/test/TEST-72-NBD/test.sh
@@ -48,9 +48,6 @@ run_server() {
         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
     chmod 644 "$TESTDIR"/server.pid || return 1
 
-    # Cleanup the terminal if we have one
-    tty -s && stty sane
-
     if ! [[ $SERIAL ]]; then
         wait_for_server_startup || return 1
     else

diff --git a/test/modules.d/80test-root/module-setup.sh b/test/modules.d/80test-root/module-setup.sh
index 3e17395f20a5b774985ef0bcd45a4d7677ea967e..ddd967dbb494b99749f8310f0e627cc24f0d7da4 100755 (executable)
--- a/test/modules.d/80test-root/module-setup.sh
+++ b/test/modules.d/80test-root/module-setup.sh
@@ -20,7 +20,7 @@ depends() {
 install() {
     inst_simple /etc/os-release
 
-    inst_multiple mkdir ln dd stty mount poweroff umount setsid sync cat grep
+    inst_multiple mkdir ln dd mount poweroff umount setsid sync cat grep
 
     inst_script "$moddir/test-init.sh" "/sbin/init"