[Fai-commit] r5364 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-04-19 20:47:02 +0000 (Sun, 19 Apr 2009)
New Revision: 5364

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
  try to umount mirror before removing old nfsroot (closes: #500208)

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-04-19 18:22:15 UTC (rev 5363)
+++ trunk/bin/make-fai-nfsroot	2009-04-19 20:47:02 UTC (rev 5364)
@@ -518,6 +518,7 @@
     umount $NFSROOT/dev/pts 1>/dev/null 2>&1 || true
     [ -L $NFSROOT/proc/self ] && umount $NFSROOT/proc || true
     [ -L $NFSROOT/proc/self ] && die "/proc is still mounted inside the nfsroot."
+    umount $NFSROOT/$MNTPOINT  2>/dev/null || true # it's safer to try to umount 
     rm -rf $oldnfsroot/.??* $oldnfsroot/*
     # also remove files $NFSROOT/.? but not . and ..
     find $oldnfsroot -xdev -maxdepth 1 ! -type d | xargs -r rm -f

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-19 18:22:15 UTC (rev 5363)
+++ trunk/debian/changelog	2009-04-19 20:47:02 UTC (rev 5364)
@@ -1,4 +1,4 @@
-fai (3.2.18~beta2) unstable; urgency=low
+fai (3.2.18~beta3) unstable; urgency=low
 
   [ Thomas Lange ]
   * control: add depends on net-tools for fai-client (closes: #521027)
@@ -12,6 +12,7 @@
     add -N to install_packages call, this is good for cross architecture
     building the nfsroot
     check if debootstrap finished properly (closes: #524369)
+    try to umount mirror before removing old nfsroot (closes: #500208)
   * fai-do-scripts: skip files with certain suffixes (closes: #500579),
     improve test if $debug is set to 1 (closes: #496072)
     call cfagent scripts with -v if fai is in debug mode