[Fai-commit] r6604 - trunk/bin

[Thomas Lange]

Author: lange
Date: 2011-07-20 09:42:31 +0000 (Wed, 20 Jul 2011)
New Revision: 6604

Modified:
   trunk/bin/make-fai-nfsroot
Log:
several minor fixes


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2011-07-19 20:37:21 UTC (rev 6603)
+++ trunk/bin/make-fai-nfsroot	2011-07-20 09:42:31 UTC (rev 6604)
@@ -285,7 +285,7 @@
     else
 	echo "Creating base.tar.xz"
 	tar --one-file-system -C $NFSROOT -cf $NFSROOT/var/tmp/base.tar --exclude var/tmp/base.tar --exclude 'var/lib/apt/lists/*_*' .
-	nice xz $NFSROOT/var/tmp/base.tar &
+	nice xz $NFSROOT/var/tmp/base.tar >/dev/null 2>&1 &
 	xzpid=$!
     fi
     touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT
@@ -438,8 +438,12 @@
     [ -d $NFSROOT/sys/class ] && umount $NFSROOT/sys
     [ -d $NFSROOT/proc/self ] && die 1 "/proc still mounted inside the nfsroot."
     umount $NFSROOT/dev/pts 2> /dev/null || true
-    /usr/lib/fai/mkramdisk -u $NFSROOT/var/lib/dpkg
 
+    mount | grep -q "on $NFSROOT/var/lib/dpkg type tmpfs"
+    if [ $? -eq 0 ]; then
+	/usr/lib/fai/mkramdisk -u $NFSROOT/var/lib/dpkg
+    fi
+
     if [ -n "$FAI_DEBMIRROR" ]; then
         test -d $NFSROOT/$MNTPOINT && umount $NFSROOT/$MNTPOINT || true
     fi
@@ -536,7 +540,7 @@
 # Kill the directory if not in recover mode
 if [ -d $NFSROOT/proc -a ! "$recover" ]
 then
-    echo $NFSROOT already exists. Removing $NFSROOT
+    echo $NFSROOT already exists. Removing it.
     umount $NFSROOT/dev/pts 1>/dev/null 2>&1 || true
     [ -L $NFSROOT/proc/self ] && umount $NFSROOT/proc || true
     [ -L $NFSROOT/proc/self ] && die 1 "/proc is still mounted inside the nfsroot."
@@ -563,7 +567,7 @@
 
 if [ -n "$xzpid" ]; then
     ps -p $xzpid >/dev/null 2>&1
-    [ $? -eq 1 ] &&  echo "xz compression of $NFSROOT/var/tmp/base.tar is still running in the background."
+    [ $? -eq 0 ] &&  echo "xz compression of $NFSROOT/var/tmp/base.tar is still running in the background."
 fi
 echo "make-fai-nfsroot finished $merror."
 exit 0