[Fai-commit] r6635 - trunk/bin

[Thomas Lange]

Author: lange
Date: 2011-08-01 09:31:19 +0000 (Mon, 01 Aug 2011)
New Revision: 6635

Modified:
   trunk/bin/make-fai-nfsroot
Log:
minor code cleanup


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2011-07-30 09:24:32 UTC (rev 6634)
+++ trunk/bin/make-fai-nfsroot	2011-08-01 09:31:19 UTC (rev 6635)
@@ -237,6 +237,8 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 call_debootstrap() {
     
+    [ -z "$FAI_DEBOOTSTRAP" ] && die 4 "\$FAI_DEBOOTSTRAP not defined."
+
     # check if NFSROOT directory is mounted with bad options
     fs=$(df -P $NFSROOT | tail -1 | awk '{print $6}')
     if mount | grep "on $fs " |  awk '{print $6}' | egrep -q "nosuid|nodev"; then
@@ -278,8 +280,6 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 create_base() {
 
-    [ -z "$FAI_DEBOOTSTRAP" ] && die 4 "\$FAI_DEBOOTSTRAP not defined."
-
     call_with_stamp call_debootstrap $FAI_DEBOOTSTRAP
     $ROOTCMD apt-get clean
     rm -f $NFSROOT/etc/resolv.conf $NFSROOT/etc/hostname $NFSROOT/etc/udev/rules.d/70-persistent-net.rules
@@ -292,7 +292,6 @@
 	nice xz $NFSROOT/var/tmp/base.tar >/dev/null 2>&1 &
 	xzpid=$!
     fi
-    touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 extract_base() {
@@ -318,7 +317,6 @@
 	      ;;
 	  esac
 
-      touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT
       echo done
     fi
 }
@@ -333,6 +331,7 @@
     else
       call_with_stamp create_base
     fi
+    touch .THIS_IS_THE_FAI_NFSROOT
     # save the list of all packages in the base.tgz
     $ROOTCMD dpkg --get-selections | awk '/install$/ {print $1}' > var/tmp/base-pkgs.lis