[Fai-commit] r3886 - in trunk: bin lib

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

Author: lange
Date: 2006-09-07 13:45:13 +0000 (Thu, 07 Sep 2006)
New Revision: 3886

Modified:
   trunk/bin/fai-debconf
   trunk/lib/fai-debconf-pipe
Log:
commit michael patches


Modified: trunk/bin/fai-debconf
===================================================================
--- trunk/bin/fai-debconf	2006-09-07 12:08:38 UTC (rev 3885)
+++ trunk/bin/fai-debconf	2006-09-07 13:45:13 UTC (rev 3886)
@@ -72,12 +72,12 @@
 	 # test if package is installed
 	 if [ -f $target/var/lib/dpkg/info/$p.list ]; then
 	     echo "Reconfiguring package $p"
-       /usr/lib/fai/fai-debconf-pipe $p &
        if [ ! -d $target/var/run/fai/ ]; then
 	   pipe=/tmp/debconf.pipe
        else
-	   pipe=$target/var/run/fai/debconf.pipe
+	   pipe=/var/run/fai/debconf.pipe
        fi
+       DEBCONF_PIPE=$pipe /usr/lib/fai/fai-debconf-pipe $p &
        DEBCONF_PIPE=$pipe DEBIAN_FRONTEND=passthrough $ROOTCMD dpkg-reconfigure $p
 	 else
 	     :

Modified: trunk/lib/fai-debconf-pipe
===================================================================
--- trunk/lib/fai-debconf-pipe	2006-09-07 12:08:38 UTC (rev 3885)
+++ trunk/lib/fai-debconf-pipe	2006-09-07 13:45:13 UTC (rev 3886)
@@ -25,7 +25,7 @@
 my $debug = $ENV{"debug"};
 
 # use /tmp if directory is not available
-my $PIPEFILE = (-d "$ENV{'target'}/var/run/fai/") ? "$ENV{'target'}/var/run/fai/debconf.pipe" : "/tmp/debconf.pipe";
+my $PIPEFILE = "$ENV{'target'}$ENV{'DEBCONF_PIPE'}";
 
 die "No package name given!\n" unless $ARGV[0];
 my $packagename = shift @ARGV;