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

[Steven Chamberlain]

Author: stevenc-guest
Date: 2012-12-11 20:50:23 +0000 (Tue, 11 Dec 2012)
New Revision: 4376

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-utils.init
   trunk/freebsd-utils/debian/geom.geli.init
Log:
* Fix geli initscript to support more than one geli_device as intended.
  (Closes: #694374)
* If devfs is unavailable (for example in a jail environment) the
  freebsd-utils start action would exit with non-zero status, causing postinst
  to fail.  Instead, return zero exit status but print a warning.
  (Closes: #695679)


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2012-12-09 21:00:00 UTC (rev 4375)
+++ trunk/freebsd-utils/debian/changelog	2012-12-11 20:50:23 UTC (rev 4376)
@@ -1,3 +1,14 @@
+freebsd-utils (9.0+ds1-9) UNRELEASED; urgency=low
+
+  * Fix geli initscript to support more than one geli_device as intended.
+    (Closes: #694374)
+  * If devfs is unavailable (for example in a jail environment) the
+    freebsd-utils start action would exit with non-zero status, causing postinst
+    to fail.  Instead, return zero exit status but print a warning.
+    (Closes: #695679)
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 11 Dec 2012 20:28:30 +0000
+
 freebsd-utils (9.0+ds1-8) unstable; urgency=low
 
    * Team upload.

Modified: trunk/freebsd-utils/debian/freebsd-utils.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init	2012-12-09 21:00:00 UTC (rev 4375)
+++ trunk/freebsd-utils/debian/freebsd-utils.init	2012-12-11 20:50:23 UTC (rev 4376)
@@ -24,13 +24,17 @@
     fi
 
     log_action_begin_msg "Loading devfs rules"
-    devfs ruleset 1
-    devfs rule delset
-    for rule in /etc/devfs.d/*.rules ; do
-      egrep -v '^[[:space:]]*(#|$)' $rule | devfs rule add -
-    done
-    devfs rule applyset
-    log_action_end_msg $?
+    if devfs ruleset 1 ; then
+      devfs rule delset
+      for rule in /etc/devfs.d/*.rules ; do
+        egrep -v '^[[:space:]]*(#|$)' $rule | devfs rule add -
+      done
+      devfs rule applyset
+      log_action_end_msg $?
+    else
+      # devfs unavailable, probably in a jail environment;  no point proceeding
+      log_end_msg 255 || exit 0 # (warning)
+    fi
 
     log_action_begin_msg "Setting up /dev links"
     # setup /dev/cdrom symlink

Modified: trunk/freebsd-utils/debian/geom.geli.init
===================================================================
--- trunk/freebsd-utils/debian/geom.geli.init	2012-12-09 21:00:00 UTC (rev 4375)
+++ trunk/freebsd-utils/debian/geom.geli.init	2012-12-11 20:50:23 UTC (rev 4376)
@@ -141,8 +141,10 @@
 				fi
 				count=$((count+1))
 			done
-			log_end_msg $RET
-			exit $RET
+			if ! [ "$RET" = 0 ]; then
+				log_end_msg $RET
+				exit $RET
+			fi
 		fi
 	done