[Fai-commit] r3382 - trunk/lib

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-04-07 13:35:30 +0000 (Fri, 07 Apr 2006)
New Revision: 3382

Modified:
   trunk/lib/subroutines-linux
Log:
during dirinst base.tgz is inside the nfsroot


Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-04-07 13:34:19 UTC (rev 3381)
+++ trunk/lib/subroutines-linux	2006-04-07 13:35:30 UTC (rev 3382)
@@ -94,9 +94,11 @@
 task_extrbase() {
 
     local fs=$FAI_ROOT/etc/$fstab
+    local basefile=/var/tmp/base.tgz
+    [ $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 /var/tmp/base.tgz | tar -C $FAI_ROOT -xpf -
+    gzip -dc $basefile | tar -C $FAI_ROOT -xpf -
     # now we can copy fstab
     [ -f $fs ] && mv $fs $fs.old
     cp -p $LOGDIR/$fstab $fs