test: name rootfs differently

To help debugging issues, name the different rootfs' differently (i.e.
include the name of the test and whether it is the server or client
part).

diff --git a/test/TEST-60-NFS/client-init.sh b/test/TEST-60-NFS/client-init.sh
index a6fb2a7faabcb2ef95806596a6b3c76c548e40ab..ac77e14aeca338b1fd989d196c85c0b3f50b7789 100755 (executable)
--- a/test/TEST-60-NFS/client-init.sh
+++ b/test/TEST-60-NFS/client-init.sh
@@ -6,7 +6,7 @@
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 exec > /dev/console 2>&1
 
-echo "made it to the rootfs!"
+echo "made it to the NFS client rootfs!"
 
 while read -r dev _ fstype opts rest || [ -n "$dev" ]; do
     [ "$fstype" != "nfs" ] && [ "$fstype" != "nfs4" ] && continue

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

diff --git a/test/TEST-70-ISCSI/client-init.sh b/test/TEST-70-ISCSI/client-init.sh
index edaed9d1ea002ba0e7a27a6657a41dce3fbf876b..38af48f624d85b4a171c60fd5b471c8738bb2209 100755 (executable)
--- a/test/TEST-70-ISCSI/client-init.sh
+++ b/test/TEST-70-ISCSI/client-init.sh
@@ -3,7 +3,7 @@
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 exec > /dev/console 2>&1
 
-echo "made it to the rootfs!"
+echo "made it to the iSCSI client rootfs!"
 while read -r dev _ fstype opts rest || [ -n "$dev" ]; do
     [ "$fstype" != "ext4" ] && continue
     echo "iscsi-OK $dev $fstype $opts" | dd oflag=direct,dsync of=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_marker status=none

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

diff --git a/test/TEST-71-ISCSI-MULTI/client-init.sh b/test/TEST-71-ISCSI-MULTI/client-init.sh
index edaed9d1ea002ba0e7a27a6657a41dce3fbf876b..e23556660283fe910d6a8608e78aa80755f434df 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/client-init.sh
+++ b/test/TEST-71-ISCSI-MULTI/client-init.sh
@@ -3,7 +3,7 @@
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 exec > /dev/console 2>&1
 
-echo "made it to the rootfs!"
+echo "made it to the iSCSI multi client rootfs!"
 while read -r dev _ fstype opts rest || [ -n "$dev" ]; do
     [ "$fstype" != "ext4" ] && continue
     echo "iscsi-OK $dev $fstype $opts" | dd oflag=direct,dsync of=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_marker status=none

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

diff --git a/test/TEST-72-NBD/client-init.sh b/test/TEST-72-NBD/client-init.sh
index d0a3c38dc2357357d343f520d0d9f52396e5f317..b81cf75777a31479905c89c7895a3d6c29e7a0ba 100755 (executable)
--- a/test/TEST-72-NBD/client-init.sh
+++ b/test/TEST-72-NBD/client-init.sh
@@ -3,7 +3,7 @@
 
 export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 exec > /dev/console 2>&1
-echo "made it to the rootfs!"
+echo "made it to the NBD client rootfs!"
 
 while read -r dev fs fstype opts rest || [ -n "$dev" ]; do
     [ "$dev" = "rootfs" ] && continue

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

diff --git a/test/modules.d/70test-root/test-init.sh b/test/modules.d/70test-root/test-init.sh
index 1f38c5e9a242451cdc94bcd3948cddc839dc6949..499a5a4a664a18e5acd65f3f4e7854e35dc8e4ca 100755 (executable)
--- a/test/modules.d/70test-root/test-init.sh
+++ b/test/modules.d/70test-root/test-init.sh
@@ -17,7 +17,7 @@ grep -q '^tmpfs /run tmpfs' /proc/self/mounts \
 : > /dev/watchdog
 
 exec > /dev/console 2>&1
-echo "made it to the rootfs!"
+echo "made it to the test rootfs!"
 
 if command -v systemctl > /dev/null 2>&1; then
     systemctl --failed --no-legend --no-pager >> /run/failed