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

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

Author: michael-guest
Date: 2006-07-23 10:39:43 +0000 (Sun, 23 Jul 2006)
New Revision: 3652

Modified:
   trunk/bin/fai-debconf
   trunk/lib/fai-debconf-pipe
Log:
updated FSF address, fai-debconf-pipe is not started within chroot anymore


Modified: trunk/bin/fai-debconf
===================================================================
--- trunk/bin/fai-debconf	2006-07-23 10:39:31 UTC (rev 3651)
+++ trunk/bin/fai-debconf	2006-07-23 10:39:43 UTC (rev 3652)
@@ -72,7 +72,7 @@
 	 # test if package is installed
 	 if [ -f $target/var/lib/dpkg/info/$p.list ]; then
 	     echo "Reconfiguring package $p"
-       $ROOTCMD /usr/bin/fai-debconf-pipe $p &
+       /usr/lib/fai/fai-debconf-pipe $p &
        DEBCONF_PIPE=/var/run/fai/debconf.pipe DEBIAN_FRONTEND=passthrough $ROOTCMD dpkg-reconfigure $p
 	 else
 	     :

Modified: trunk/lib/fai-debconf-pipe
===================================================================
--- trunk/lib/fai-debconf-pipe	2006-07-23 10:39:31 UTC (rev 3651)
+++ trunk/lib/fai-debconf-pipe	2006-07-23 10:39:43 UTC (rev 3652)
@@ -15,7 +15,7 @@
 # `/usr/share/common-licences/GPL' in the Debian GNU/Linux distribution
 # or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html. You
 # can also obtain it by writing to the Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
 
@@ -24,7 +24,7 @@
 
 my $debug = $ENV{"debug"};
 
-my $PIPEFILE="/var/run/fai/debconf.pipe";
+my $PIPEFILE = $ENV{"target"}."/var/run/fai/debconf.pipe";
 
 die "No package name given!\n" unless $ARGV[0];
 my $packagename = shift @ARGV;
@@ -38,7 +38,7 @@
 print "Reading from <". $ENV{"LOGDIR"}."/debconf.data ... " if $debug;
 
 while(<DH>) {
-  print "read: $_";
+  print "read: $_" if $debug;
   chomp;
   next unless /^([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]*(.*)$/;
   print "extracted: PN: $1, Q: $2, T: $3, A: $4\n" if $debug;


Property changes on: trunk/lib/fai-debconf-pipe
___________________________________________________________________
Name: svn:executable
   + *