[Fai-commit] r5646 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-11-02 13:59:51 +0000 (Mon, 02 Nov 2009)
New Revision: 5646

Modified:
   trunk/bin/fai
   trunk/debian/changelog
Log:
  remove use of fifo, use bash process substitution instead

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2009-11-02 13:46:28 UTC (rev 5645)
+++ trunk/bin/fai	2009-11-02 13:59:51 UTC (rev 5646)
@@ -302,23 +302,7 @@
 [ -n "$newhostname" ] && echo "Hostname set to $HOSTNAME" | tee -a $LOGDIR/fai.log
 unset newhostname
 
-# remove this crap, use old thing
-mkfifo $LOGDIR/logfifo
-tee -a $LOGDIR/fai.log < $LOGDIR/logfifo &
-# in bash &> redirect stdout and stderr to file
-fstart &> $LOGDIR/logfifo
-rm $LOGDIR/logfifo
-sleep 1 # wait for tee to complete. One second should be ok
-# old code
-# {
-# # a bash group command with { does not work on sparc
-# task confdir
-# task setup
-# task defclass
-# task defvar
-# load_keymap_consolechars
-# set_disk_info
-# } > >( tee -a $LOGDIR/fai.log )  2>&1
+fstart > >( tee -a $LOGDIR/fai.log )  2>&1
 
 [ "$action" ] && export FAI_ACTION=$action
 unset action

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-11-02 13:46:28 UTC (rev 5645)
+++ trunk/debian/changelog	2009-11-02 13:59:51 UTC (rev 5646)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta35) unstable; urgency=low
+fai (3.3~b2) unstable; urgency=low
 
   [ Thomas Lange ]
   * NEWS: add hint about missing packages in nfsroot, changes in
@@ -115,6 +115,7 @@
   * fai: check if make-fai-nfsroot.conf is available if dirinstall is used
     dirinstall now uses $FAI_CONFIG_SRC instead of $FAI_CONFIGDIR
     change PATH, move /sbin to the end
+    remove use of fifo, use bash process substitution instead
   * control: update to standards version 3.8.3, no changes needed
   * Fstab.pm: print uuid and label of partition to console
   * NFSROOT, make-fai-nfsroot.conf: remove dhcp3-client and dhcp-client,