[Fai-commit] r6027 - in branches/stable/3.4: debian lib

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:57:37 +0000 (Tue, 17 Aug 2010)
New Revision: 6027

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/lib/get-config-dir
Log:
get-config-dir: change error message


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:57:33 UTC (rev 6026)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:57:37 UTC (rev 6027)
@@ -1,4 +1,4 @@
-fai (3.4~beta10) unstable; urgency=low
+fai (3.4~beta15) unstable; urgency=low
 
   [ Thomas Lange ]
   * get-config-dir-http: new script to get a tarball of the config space
@@ -89,6 +89,12 @@
   * fai-mirror: use $mirrordir if no argument given (closes: #428597)
   * get-config-dir-svn: use exit code of first command of pipe
     (closes: #557544)
+  * device2grub: fix indentation, minor code fix
+  * fai-start-stop-daemon: remove it, because not needed any more,
+    policy-rc.d is sufficient
+  * fai-server.install, updatebase, make-fai-nfsroot, Makefile: remove
+    fai-start-stop-daemon
+  * get-config-dir: change error message
     
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.3
@@ -125,6 +131,8 @@
     partition is marked as preserve
   * setup-storage/Exec.pm: All unexpected non-zero exit codes of subcommands
     lead to immediate failure of setup-storage.
+  * setup-storage/Volumes.pm: Use absolute path names for devices in volume
+    groups, RAID volumes.
 
   [ Michael Prokop ]
   * subroutines, fai: make sure fai exits with the according return
@@ -156,7 +164,7 @@
     if the shortname has no match in device.map. Needed now that grub2 in
     unstable has switched to using stable names in device.map.
   
- -- Thomas Lange <lange at debian.org>  Wed, 28 Jul 2010 16:28:51 -0400
+ -- Thomas Lange <lange at debian.org>  Thu, 29 Jul 2010 23:23:36 -0400
 
 fai (3.3.5) unstable; urgency=high
 

Modified: branches/stable/3.4/lib/get-config-dir
===================================================================
--- branches/stable/3.4/lib/get-config-dir	2010-08-17 12:57:33 UTC (rev 6026)
+++ branches/stable/3.4/lib/get-config-dir	2010-08-17 12:57:37 UTC (rev 6027)
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+# $Id$
+#
 # (c) 2006 Henning Glawe <glaweh at debian.org>
-# (c) 2009 Thomas Lange  <lange at debian.org>
+# (c) 2009-2010 Thomas Lange  <lange at debian.org>
 
 ### BEGIN SUBROUTINE INFO
 # Provides-Var:
@@ -12,7 +14,8 @@
 
 if [ -z "$FAI_CONFIG_SRC" ]; then
 	sendmon "TASKERROR get_fai_dir 21"
-	echo "Error: Provide the URL to obtain the fai config storage in \$FAI_CONFIG_SRC"
+	echo "ERROR: No URL defined for the config space."
+	echo "ERROR: Set \$FAI_CONFIG_SRC or use option -s."
 	exit 21
 fi