test: correct cmdline reading functions

diff --git a/test/TEST-01-BASIC/test-init.sh b/test/TEST-01-BASIC/test-init.sh
index a8b6e393ace145a0ae5509170bd97810bf57cae1..78f124a5b26572cf7646288821e5e211d2cf0294 100755 (executable)
--- a/test/TEST-01-BASIC/test-init.sh
+++ b/test/TEST-01-BASIC/test-init.sh
@@ -2,7 +2,7 @@
 >/dev/watchdog
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-02-SYSTEMD/test-init.sh b/test/TEST-02-SYSTEMD/test-init.sh
index 0999bc0260c65e3b5a62cf2df37be67555380966..63fd58f7f353eccdf1e5d08bdffec40cab1f1d92 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test-init.sh
+++ b/test/TEST-02-SYSTEMD/test-init.sh
@@ -2,7 +2,7 @@
 
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 
@@ -99,7 +99,7 @@ getargbool() {
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 strstr() { [ "${1##*"$2"*}" != "$1" ]; }
-CMDLINE=$(while read line || [ -n "$line" ]; do echo $line;done < /proc/cmdline)
+
 plymouth --quit
 exec </dev/console >/dev/console 2>&1
 echo "dracut-root-block-success" >/dev/sda1

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index 61895618d326604ac3be889d5e7cf684d299f0df..973627872349e9a931a9ecee80239604eb98d101 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on a ext3 filesystem"
 KVERSION="${KVERSION-$(uname -r)}"
 
 # Uncomment this to debug failures
-#DEBUGFAIL="rd.shell"
+#DEBUGFAIL="rd.shell=1 rd.break"
 test_run() {
     $testdir/run-qemu \
        -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext3 \

diff --git a/test/TEST-03-USR-MOUNT/test-init.sh b/test/TEST-03-USR-MOUNT/test-init.sh
index 68eaff05647bbeedfd68b1adac4af15e8107392b..dc03359a57aafda8129172be38ad0c0889323a03 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test-init.sh
+++ b/test/TEST-03-USR-MOUNT/test-init.sh
@@ -2,7 +2,7 @@
 >/dev/watchdog
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh
index e388afca605d88d8b1e9eb0ff1ec177bbd1bd2a1..3b29beec41af14aba9131ea9e61803edf557ee7f 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test-init.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh
@@ -2,7 +2,7 @@
 >/dev/watchdog
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-10-RAID/test-init.sh b/test/TEST-10-RAID/test-init.sh
index 7eb932a04468e780fa6f11b60fbba0cd21e5d97c..5ca9de15b1ddf30ab1879fec26ac5bcec01e5038 100755 (executable)
--- a/test/TEST-10-RAID/test-init.sh
+++ b/test/TEST-10-RAID/test-init.sh
@@ -2,7 +2,7 @@
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-11-LVM/test-init.sh b/test/TEST-11-LVM/test-init.sh
index 18fd2b35a607275d8cb8fec245c5d4fe638dc68b..00d9da7778a8dcf82ff4fe2372c524fc99e484a6 100755 (executable)
--- a/test/TEST-11-LVM/test-init.sh
+++ b/test/TEST-11-LVM/test-init.sh
@@ -2,7 +2,7 @@
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-12-RAID-DEG/test-init.sh b/test/TEST-12-RAID-DEG/test-init.sh
index 7eb932a04468e780fa6f11b60fbba0cd21e5d97c..5ca9de15b1ddf30ab1879fec26ac5bcec01e5038 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test-init.sh
+++ b/test/TEST-12-RAID-DEG/test-init.sh
@@ -2,7 +2,7 @@
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-14-IMSM/test-init.sh b/test/TEST-14-IMSM/test-init.sh
index 127185a23b1fd75bfd905b446885b2241a5f7433..01cbe961e6ece8473e6fe7bb40c20eafa5871e25 100755 (executable)
--- a/test/TEST-14-IMSM/test-init.sh
+++ b/test/TEST-14-IMSM/test-init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-16-DMSQUASH/test-init.sh b/test/TEST-16-DMSQUASH/test-init.sh
index 5fe523c17700bdf5f60c257786c0f806e46ca750..3a93c8023753cf9f51ccc09c4deba8da4c7c5279 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test-init.sh
+++ b/test/TEST-16-DMSQUASH/test-init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-17-LVM-THIN/test-init.sh b/test/TEST-17-LVM-THIN/test-init.sh
index 77fb346d698048a9cfaeb0f81d4dceb0b738b39f..cb9d921d6c30fe22415f1293b7a958155b80ff6f 100755 (executable)
--- a/test/TEST-17-LVM-THIN/test-init.sh
+++ b/test/TEST-17-LVM-THIN/test-init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-20-NFS/client-init.sh b/test/TEST-20-NFS/client-init.sh
index eea162cbcce2f0e7920a4b9e884f93de55686292..55762d1eef3bcaa4d61259b472a235a6934b5264 100755 (executable)
--- a/test/TEST-20-NFS/client-init.sh
+++ b/test/TEST-20-NFS/client-init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-30-ISCSI/client-init.sh b/test/TEST-30-ISCSI/client-init.sh
index 7279987ca5d56ecd048b1ee1abd7f9af6397f02c..7a5b7546d6e8f6095ef1bf0dc927928af6c3adc8 100755 (executable)
--- a/test/TEST-30-ISCSI/client-init.sh
+++ b/test/TEST-30-ISCSI/client-init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }
 

diff --git a/test/TEST-50-MULTINIC/client-init.sh b/test/TEST-50-MULTINIC/client-init.sh
index d9ba45ec81a7bf6282d31b9452d75e83b8e8c193..529379f0e57f86dcc2a0e3d8973487567da7d73b 100755 (executable)
--- a/test/TEST-50-MULTINIC/client-init.sh
+++ b/test/TEST-50-MULTINIC/client-init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 getcmdline() {
     while read -r _line || [ -n "$_line" ]; do
-        printf "%s" "$line"
+        printf "%s" "$_line"
     done </proc/cmdline;
 }