[Fai-commit] r5375 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2009-04-22 11:35:33 +0000 (Wed, 22 Apr 2009)
New Revision: 5375

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines-linux
Log:
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.
(closes: #525096)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-22 06:31:57 UTC (rev 5374)
+++ trunk/debian/changelog	2009-04-22 11:35:33 UTC (rev 5375)
@@ -1,3 +1,12 @@
+fai (3.2.19) unstable; urgency=low
+
+  * 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.
+    (closes: #525096)
+
+ -- Thomas Lange <lange at debian.org>  Wed, 22 Apr 2009 13:31:21 +0200
+
 fai (3.2.18) unstable; urgency=low
 
   [ Thomas Lange ]

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2009-04-22 06:31:57 UTC (rev 5374)
+++ trunk/lib/subroutines-linux	2009-04-22 11:35:33 UTC (rev 5375)
@@ -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."