[Glibc-bsd-commits] r4235 - trunk/freebsd-utils/debian

[Steven Chamberlain]

Author: stevenc-guest
Date: 2012-04-25 21:25:26 +0000 (Wed, 25 Apr 2012)
New Revision: 4235

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/geom.geli.init
Log:
Return exit status 0 from the geli initscript if not configured, but display a warning.  (Closes: #670412)


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2012-04-22 20:23:04 UTC (rev 4234)
+++ trunk/freebsd-utils/debian/changelog	2012-04-25 21:25:26 UTC (rev 4235)
@@ -1,9 +1,14 @@
 freebsd-utils (9.0+ds1-4) UNRELEASED; urgency=low
 
+  [ Robert Millan ]
   * Start devd after kldutils to ensure kern.module_path has been set.
 
- -- Robert Millan <rmh at debian.org>  Thu, 19 Apr 2012 19:36:07 +0200
+  [ Steven Chamberlain ]
+  * Return exit status 0 from the geli initscript if not configured, but
+    display a warning.  (Closes: #670412)
 
+ -- Steven Chamberlain <steven at pyro.eu.org>  Wed, 25 Apr 2012 22:24:50 +0100
+
 freebsd-utils (9.0+ds1-3) unstable; urgency=low
 
   * Restore default CPU frequency after stopping powerd.

Modified: trunk/freebsd-utils/debian/geom.geli.init
===================================================================
--- trunk/freebsd-utils/debian/geom.geli.init	2012-04-22 20:23:04 UTC (rev 4234)
+++ trunk/freebsd-utils/debian/geom.geli.init	2012-04-25 21:25:26 UTC (rev 4235)
@@ -102,12 +102,13 @@
 
 geli_start()
 {
-	log_begin_msg "Starting GELI subsystem..."
+	log_begin_msg "Starting GELI subsystem:"
 
 	devices=`geli_make_list`
 	if [ -z "${devices}" ]; then
-		log_failure_msg "UNCONFIGURED. See /etc/default/geli"
-		exit 1
+		log_progress_msg "not configured; see /etc/default/geli"
+		log_end_msg 255 # (warning)
+		exit 0
 	fi
 
 	log_progress_msg "geom_eli"
@@ -151,7 +152,7 @@
 
 geli_stop()
 {
-	log_begin_msg "Stopping GELI subsystem..."
+	log_begin_msg "Stopping GELI subsystem:"
 
 	devices=`geli_make_list`