Hi release team, please unblock FAI 4.0.6. It fixes one important bug (#699555) and two normal bugs (#699279, #690016) by changing only a few lines
bin/fai-debconf | 4 ++-- lib/subroutines | 7 ++++--- diff -Nru fai-4.0.5/bin/fai-debconf fai-4.0.6/bin/fai-debconf --- fai-4.0.5/bin/fai-debconf 2012-04-10 12:01:46.000000000 +0200 +++ fai-4.0.6/bin/fai-debconf 2013-02-01 21:36:33.000000000 +0100 @@ -5,7 +5,7 @@ # fai-debconf - set debconf values using classes # # This script is part of FAI (Fully Automatic Installation) -# (c) 2005-2010 by Thomas Lange, [email protected] +# (c) 2005-2013 by Thomas Lange, [email protected] # Universitaet zu Koeln # #********************************************************************* @@ -37,7 +37,7 @@ for class in $classes ; do [ -f $class ] && add_data $class if [ -d $class ]; then - for f in $(ls $class/* | egrep '^[[:alnum:]_.-]+$') ; do + for f in $(ls $class/* | egrep '^[[:alnum:]/_.-]+$') ; do [ -f $f ] && add_data $f done fi diff -Nru fai-4.0.5/debian/changelog fai-4.0.6/debian/changelog --- fai-4.0.5/debian/changelog 2012-12-27 20:56:34.000000000 +0100 +++ fai-4.0.6/debian/changelog 2013-02-01 21:33:38.000000000 +0100 @@ -1,3 +1,10 @@ +fai (4.0.6) unstable; urgency=low + + * do not reboot if error.log is empty Closes: #699279, #690016 + * fai-debconf: fix regex Closes: #699555 + + -- Thomas Lange <[email protected]> Fri, 01 Feb 2013 21:25:08 +0100 + fai (4.0.5) unstable; urgency=low * fai-make-nfsroot: make initrd readable for tftp daemon Closes: #693871 diff -Nru fai-4.0.5/lib/subroutines fai-4.0.6/lib/subroutines --- fai-4.0.5/lib/subroutines 2012-12-04 12:12:59.000000000 +0100 +++ fai-4.0.6/lib/subroutines 2013-02-01 21:30:59.000000000 +0100 @@ -435,6 +435,7 @@ fi done + echo "Defining variables from additional.var" # /fai/class/* scripts or hooks can write variable definitions # to additonal.var. now source these definitions if [ -f $LOGDIR/additional.var -a -r $LOGDIR/additional.var ]; then @@ -509,9 +510,9 @@ : ${flag_reboot:=0} : ${flag_halt:=0} - # reboot/halt without prompting if FAI_FLAG reboot or halt is set and errors are found - # wait for keypress if error is found and neither flag reboot nor halt is set - if [ -s $LOGDIR/error.log -a "$flag_reboot" -eq 0 -a "$flag_halt" -eq 0 ]; then + # reboot/halt without prompting if FAI_FLAG reboot or halt is set + # wait for keypress if neither flag reboot nor halt is set + if [ "$flag_reboot" -eq 0 -a "$flag_halt" -eq 0 ]; then echo "Press <RETURN> to reboot." read else -- regards Thomas -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
