[Fai-commit] r4669 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-11-10 12:34:00 +0000 (Sat, 10 Nov 2007)
New Revision: 4669

Modified:
   trunk/bin/make-fai-nfsroot
Log:
remove whole /srv/fai/nfsroot, not only /srv/fai/nfsroot/live/filesystem.dir


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-11-10 11:23:10 UTC (rev 4668)
+++ trunk/bin/make-fai-nfsroot	2007-11-10 12:34:00 UTC (rev 4669)
@@ -129,6 +129,7 @@
 [ -n "$KERNELPACKAGE" ] && badupdateto32 "The use of \$KERNELPACKAGE is deprecated. Please use $cfdir/NFSROOT now."
 [ ! -d "$cfdir/apt" ] && die "$cfdir/apt/ does not exists. Can't continue."
 
+oldnfsroot=$NFSROOT
 NFSROOT="$NFSROOT/live/filesystem.dir"
 ROOTCMD="chroot $NFSROOT"
 
@@ -497,9 +498,9 @@
 then
     echo $NFSROOT already exists. Removing $NFSROOT
     umount $NFSROOT/dev/pts 1>/dev/null 2>&1 || true
-    rm -rf $NFSROOT/.??* $NFSROOT/*
+    rm -rf $oldnfsroot/.??* $oldnfsroot/*
     # also remove files $NFSROOT/.? but not . and ..
-    find $NFSROOT -xdev -maxdepth 1 ! -type d | xargs -r rm -f
+    find $oldnfsroot -xdev -maxdepth 1 ! -type d | xargs -r rm -f
 fi
 
 # Create a new nfsroot