[Fai-commit] r3800 - trunk/lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-08-25 13:12:02 +0000 (Fri, 25 Aug 2006)
New Revision: 3800

Modified:
   trunk/lib/subroutines-linux
Log:
new indentation,  ftar $FAI/basefiles is correct, not files/basefiles


Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-08-25 13:09:16 UTC (rev 3799)
+++ trunk/lib/subroutines-linux	2006-08-25 13:12:02 UTC (rev 3800)
@@ -118,11 +118,11 @@
     echo "Unpacking Debian base archive"
     # copy the base file class based if it exists
     ftar -1v -s $FAI/basefiles /
-if [ $? -ne 0 ]; then
-    [ $DO_INIT_TASKS -eq 0 ] && basefile=$NFSROOT/var/tmp/base.tgz
-    # extract the tar file which was the result of debootstrap
-    gzip -dc $basefile | tar -C $FAI_ROOT -xpf -
-fi
+    if [ $? -ne 0 ]; then
+	[ $DO_INIT_TASKS -eq 0 ] && basefile=$NFSROOT/var/tmp/base.tgz
+	# extract the tar file which was the result of debootstrap
+	gzip -dc $basefile | tar -C $FAI_ROOT -xpf -
+    fi
     # now we can copy fstab
     [ -f $fs ] && mv $fs $fs.old
     [ -f $LOGDIR/fstab ] && cp -p $LOGDIR/fstab $fs