summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2012-11-19 16:59:30 +0100
committerHarald Hoyer <harald@redhat.com>2012-11-19 17:03:55 +0100
commit2b9be6f7077a5c6513aa40fc35944f118ed1e404 (patch)
tree48b509ff7c576539242e53118aa2c8e26e9697f7
parentb26897fb6099ed9ee67ed6e19e751be11d38fcf3 (diff)
downloaddracut-2b9be6f7077a5c6513aa40fc35944f118ed1e404.tar.gz
dracut-2b9be6f7077a5c6513aa40fc35944f118ed1e404.tar.bz2
dracut-2b9be6f7077a5c6513aa40fc35944f118ed1e404.zip
[nfs|cifs]root.sh: make "/dev/root" a symlink, so it gets cleaned up later on
-rwxr-xr-xmodules.d/95cifs/cifsroot.sh2
-rwxr-xr-xmodules.d/95nfs/nfsroot.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules.d/95cifs/cifsroot.sh b/modules.d/95cifs/cifsroot.sh
index 7956d6f6..677318b1 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 589d4ed7..ec0f3767 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