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

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

Author: lange
Date: 2006-09-06 14:00:07 +0000 (Wed, 06 Sep 2006)
New Revision: 3874

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


Modified: trunk/bin/fai-debconf
===================================================================
--- trunk/bin/fai-debconf	2006-09-06 12:55:03 UTC (rev 3873)
+++ trunk/bin/fai-debconf	2006-09-06 14:00:07 UTC (rev 3874)
@@ -26,7 +26,7 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="version 1.2.1, 1-august-2006"
+version="version 1.2.2, 1-september-2006"
 
 # variables needed: $classes, $ROOTCMD, $LOGDIR, $target
     
@@ -73,7 +73,7 @@
 	 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
+       if [ ! -d $target/var/run/fai/ ]; then
 	   pipe=/tmp/debconf.pipe
        else
 	   pipe=$target/var/run/fai/debconf.pipe

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