From: Harald Hoyer <harald@redhat.com>
Date: Mon, 19 Nov 2012 15:59:30 +0000 (+0100)
Subject: [nfs|cifs]root.sh: make "/dev/root" a symlink, so it gets cleaned up later on
X-Git-Tag: 025~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b9be6f7077a5c6513aa40fc35944f118ed1e404;p=thirdparty%2Fdracut.git

[nfs|cifs]root.sh: make "/dev/root" a symlink, so it gets cleaned up later on
---

diff --git a/modules.d/95cifs/cifsroot.sh b/modules.d/95cifs/cifsroot.sh
index 7956d6f6f..677318b10 100755
--- a/modules.d/95cifs/cifsroot.sh
+++ b/modules.d/95cifs/cifsroot.sh
@@ -18,7 +18,7 @@ echo server: $server
 echo path: $path
 echo options: $options
 
-mount.cifs //$server/$path $NEWROOT -o $options && { [ -e /dev/root ] || >/dev/root ; }
+mount.cifs //$server/$path $NEWROOT -o $options && { [ -e /dev/root ] || ln -s null /dev/root ; }
 
 # inject new exit_if_exists
 echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm "$job"' > $hookdir/initqueue/cifs.sh
diff --git a/modules.d/95nfs/nfsroot.sh b/modules.d/95nfs/nfsroot.sh
index 589d4ed7d..ec0f3767e 100755
--- a/modules.d/95nfs/nfsroot.sh
+++ b/modules.d/95nfs/nfsroot.sh
@@ -16,7 +16,7 @@ NEWROOT="$3"
 nfs_to_var $root $netif
 [ -z "$server" ] && die "Required parameter 'server' is missing"
 
-mount_nfs $root $NEWROOT $netif && { [ -e /dev/root ] || >/dev/root ; }
+mount_nfs $root $NEWROOT $netif && { [ -e /dev/root ] || ln -s null /dev/root ; }
 
 # inject new exit_if_exists
 echo 'settle_exit_if_exists="--exit-if-exists=/dev/root"; rm "$job"' > $hookdir/initqueue/nfs.sh