[Fai-commit] r3523 - in people/mugwump/vserver: . lib

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

Author: samv-guest
Date: 2006-06-19 07:27:44 +0000 (Mon, 19 Jun 2006)
New Revision: 3523

Modified:
   people/mugwump/vserver/
   people/mugwump/vserver/lib/subroutines-linux
Log:
Some more minor modifications for VIRTUAL installs



Property changes on: people/mugwump/vserver
___________________________________________________________________
Name: svk:merge
   - d29f7b36-84ff-0310-85ce-ba787dbd31ca:/local/fai/people/mugwump/vserver:10452
   + d29f7b36-84ff-0310-85ce-ba787dbd31ca:/local/fai/people/mugwump/vserver:10463

Modified: people/mugwump/vserver/lib/subroutines-linux
===================================================================
--- people/mugwump/vserver/lib/subroutines-linux	2006-06-14 10:03:47 UTC (rev 3522)
+++ people/mugwump/vserver/lib/subroutines-linux	2006-06-19 07:27:44 UTC (rev 3523)
@@ -49,11 +49,11 @@
 task_confdir() {
 
     if [ $DO_INIT_TASKS -eq 1 ] ; then
-        local bootlog
-        eval_cmdline
-
 	if [ -z "$VIRTUAL" ]
 	then
+            local bootlog
+            eval_cmdline
+
             bootlog=$LOGDIR/boot.log
             get-boot-info
             echo "Reading $bootlog"
@@ -99,10 +99,14 @@
 
     local fs=$FAI_ROOT/etc/$fstab
     local basefile=/var/tmp/base.tgz
-    [ $DO_INIT_TASKS -eq 0 ] && basefile=$NFSROOT/var/tmp/base.tgz
+    [ ! -e $basefile ] && [ $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 -
+    if [ -n "$VIRTUAL" ]
+    then
+	 tar_no_dev="--exclude=./dev --exclude=./proc"
+    fi
+    gzip -dc $basefile | tar -C $FAI_ROOT $tar_no_dev -xpf -
     # now we can copy fstab
     [ -f $fs ] && mv $fs $fs.old
     cp -p $LOGDIR/$fstab $fs