diff options
Diffstat (limited to 'test/TEST-20-NFS/client-init.sh')
| -rwxr-xr-x | test/TEST-20-NFS/client-init.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/TEST-20-NFS/client-init.sh b/test/TEST-20-NFS/client-init.sh index 04fb6a7..f50d0e2 100755 --- a/test/TEST-20-NFS/client-init.sh +++ b/test/TEST-20-NFS/client-init.sh @@ -13,13 +13,13 @@ stty sane if getargbool 0 rd.shell; then [ -c /dev/watchdog ] && printf 'V' > /dev/watchdog strstr "$(setsid --help)" "control" && CTTY="-c" - setsid $CTTY sh -i + setsid ${CTTY:+"${CTTY}"} sh -i fi echo "made it to the rootfs! Powering down." while read -r dev _ fstype opts rest || [ -n "$dev" ]; do - [ "$fstype" != "nfs" -a "$fstype" != "nfs4" ] && continue + [ "$fstype" != "nfs" ] && [ "$fstype" != "nfs4" ] && continue echo "nfs-OK $dev $fstype $opts" | dd oflag=direct,dsync of=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_marker status=none break done < /proc/mounts @@ -31,7 +31,7 @@ if grep -qF 'rd.live.overlay' /proc/cmdline; then fi fi -if [ "$fstype" = "nfs" -o "$fstype" = "nfs4" ]; then +if [ "$fstype" = "nfs" ] || [ "$fstype" = "nfs4" ]; then serverip=${dev%:*} path=${dev#*:} |