[Fai-commit] r5374 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2009-04-22 06:31:57 +0000 (Wed, 22 Apr 2009)
New Revision: 5374

Added:
   people/michael/experimental/patches/bugfix-task_confdir
Modified:
   people/michael/experimental/patches/series
Log:
Added bugfix for missing get-config-dir in some situations

BTW: this will yield 3.2.18+experimental27 because we already had some
experimental25 releases before, but changes in versions in trunk caused a reset
to experimental1


Added: people/michael/experimental/patches/bugfix-task_confdir
===================================================================
--- people/michael/experimental/patches/bugfix-task_confdir	                        (rev 0)
+++ people/michael/experimental/patches/bugfix-task_confdir	2009-04-22 06:31:57 UTC (rev 5374)
@@ -0,0 +1,28 @@
+2009-04-22  Michael Tautschnig  <mt at debian.org>
+
+	* subroutines-linux: get-config-dir was never run if -z $monserver, which may
+		be the case when no DHCP was done (dirinstall, softupdates, or install using
+		fixed IP); problem was introduced by patch in r5338.
+Index: trunk/lib/subroutines-linux
+===================================================================
+--- trunk.orig/lib/subroutines-linux
++++ trunk/lib/subroutines-linux	
+@@ -79,8 +79,8 @@
+     [ -z "$monserver" ] && monserver=$SERVER
+     if [ -z "$monserver" ]; then
+ 	echo "No monitor daemon defined."
+-	return
+-    fi
++  faimond=0
++    else
+     faimond=1
+     sendhostname=$HOSTNAME # save current hostname
+     if sendmon check; then
+@@ -90,6 +90,7 @@
+ 	faimond=0
+ 	echo "Can't connect to monserver on $monserver port 4711. Monitoring disabled."
+     fi
++    fi
+ 
+     get-config-dir || {
+ 	echo "Problems accessing the config space."

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-04-20 16:04:05 UTC (rev 5373)
+++ people/michael/experimental/patches/series	2009-04-22 06:31:57 UTC (rev 5374)
@@ -1,3 +1,4 @@
+bugfix-task_confdir
 logtail
 grub-pc
 bugfix-506459