[Fai-commit] r3799 - trunk/lib

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

Author: lange
Date: 2006-08-25 13:09:16 +0000 (Fri, 25 Aug 2006)
New Revision: 3799

Modified:
   trunk/lib/subroutines-linux
Log:
use ftar on files/basefiles/<classname> before extracting base.tgz


Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-08-25 12:58:17 UTC (rev 3798)
+++ trunk/lib/subroutines-linux	2006-08-25 13:09:16 UTC (rev 3799)
@@ -114,10 +114,15 @@
 
     local fs=$FAI_ROOT/etc/fstab
     local basefile=/var/tmp/base.tgz
+
+    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
-    echo "Unpacking Debian base archive"
     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