[Fai-commit] r5649 - in trunk: bin debian lib
Thomas Lange
lange at alioth.debian.org
Mon Nov 2 15:18:00 UTC 2009
Author: lange
Date: 2009-11-02 15:17:57 +0000 (Mon, 02 Nov 2009)
New Revision: 5649
Modified:
trunk/bin/faimond-gui
trunk/debian/changelog
trunk/lib/subroutines
Log:
* control: update to standards version 3.8.3, no changes needed
send correct message for faimond-gui before rebooting
* faimond-gui: add task tests, fix handling of reboot message
Modified: trunk/bin/faimond-gui
===================================================================
--- trunk/bin/faimond-gui 2009-11-02 14:12:31 UTC (rev 5648)
+++ trunk/bin/faimond-gui 2009-11-02 15:17:57 UTC (rev 5649)
@@ -42,7 +42,7 @@
$tasklist[0] = ' 'x15 . 'hostname'. ' 'x15;
$rowcount = 0;
-%message = ( 'TASKBEGIN' => 'BEG', 'TASKEND' => 'END', 'REBOOT' => 'reboot');
+%message = ( 'TASKBEGIN' => 'BEG', 'TASKEND' => 'END');
# - - - - - - - - - - - - - - - - - -
sub getinp {
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-11-02 14:12:31 UTC (rev 5648)
+++ trunk/debian/changelog 2009-11-02 15:17:57 UTC (rev 5649)
@@ -3,6 +3,7 @@
[ Thomas Lange ]
* NEWS: add hint about missing packages in nfsroot, changes in
dirinstall
+ * control: update to standards version 3.8.3, no changes needed
* sources.list,make-fai-nfsroot.conf: use Debian geo mirrors
* README: use description from control file
* subroutines-linux: fix log message
@@ -22,6 +23,7 @@
check if test.log exists before using grep
add APT keys from package_config/*.asc files (closes: #363701,#504018)
add keys after copying /etc/apt to /target, do copy 10fai
+ send correct message for faimond-gui before rebooting
* fai-class: add string warning to message
* task_sysinfo: call blkid on all disks
* fcopy: add die() after open command
@@ -66,7 +68,7 @@
* package_config/FAIBASE: remove rsh-client, discover
* fai-chboot: ignore ~ and .bak entries
* fai-chboot, fai-chboot.8: add option -u
- * faimond-gui: add task tests
+ * faimond-gui: add task tests, fix handling of reboot message
* tests/Faitest.pm: new file including subroutines for tests. Thanks to
Sebastian Hetze for the initial version.
* tests/FAIBASE_TEST: add simple test for partition layout of FAIBASE
@@ -117,7 +119,6 @@
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,
since it's now in the default configuration of debootstrap
Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines 2009-11-02 14:12:31 UTC (rev 5648)
+++ trunk/lib/subroutines 2009-11-02 15:17:57 UTC (rev 5649)
@@ -442,7 +442,7 @@
sendmon "TASKEND faiend 0"
[ "$flag_reboot" -lt "1" ] && read
echo "Rebooting $HOSTNAME now"
- sendmon "TASKEND REBOOT 0"
+ sendmon "TASKEND reboot 0"
cd /
sync
More information about the Fai-commit
mailing list