move /var/lib/nfs/rpc_pipefs to NEWROOT only if directory exists

diff --git a/modules.d/40nfsroot/nfsroot-cleanup.sh b/modules.d/40nfsroot/nfsroot-cleanup.sh
index 7bdec0acf68488dd6759fea60a0ed6aa8a8874d1..4e0d7ad43b52521e88d8fd331a107c888a8b6e3a 100644 (file)
--- a/modules.d/40nfsroot/nfsroot-cleanup.sh
+++ b/modules.d/40nfsroot/nfsroot-cleanup.sh
@@ -6,4 +6,11 @@ pid=$(pidof rpc.statd)
 pid=$(pidof rpcbind)
 [ -n "$pid" ] && kill $pid
 
-mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/var/lib/nfs/rpc_pipefs
+mkdir -p 
+
+if [ -d $NEWROOT/var/lib/nfs/rpc_pipefs ]; then
+    mount --move /var/lib/nfs/rpc_pipefs $NEWROOT/var/lib/nfs/rpc_pipefs
+else
+    umount /var/lib/nfs/rpc_pipefs
+fi
+