[Glibc-bsd-commits] r3676 - trunk/zfsutils/debian

[Robert Millan]

Author: rmh
Date: 2011-08-08 13:40:32 +0000 (Mon, 08 Aug 2011)
New Revision: 3676

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/zfsutils.zfs.init
Log:
Bring back mount/unmount routines in init script. See #637020 and #637086 for details.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-08-07 22:28:47 UTC (rev 3675)
+++ trunk/zfsutils/debian/changelog	2011-08-08 13:40:32 UTC (rev 3676)
@@ -1,3 +1,10 @@
+zfsutils (8.2-4) UNRELEASED; urgency=low
+
+  * Bring back mount/unmount routines in init script. See #637020 and
+    #637086 for details.
+
+ -- Robert Millan <rmh at debian.org>  Mon, 08 Aug 2011 13:40:08 +0000
+
 zfsutils (8.2-3) unstable; urgency=low
 
   * Set "X-Start-Before: checkroot" so that boot doesn't break when

Modified: trunk/zfsutils/debian/zfsutils.zfs.init
===================================================================
--- trunk/zfsutils/debian/zfsutils.zfs.init	2011-08-07 22:28:47 UTC (rev 3675)
+++ trunk/zfsutils/debian/zfsutils.zfs.init	2011-08-08 13:40:32 UTC (rev 3676)
@@ -43,6 +43,15 @@
 		esac
 	done
 
+	# filesystems
+	log_progress_msg "filesystems"
+	zfs mount -a
+	RET=$?
+	if [ $RET != 0 ] ; then
+		log_end_msg $RET
+		exit $RET
+	fi
+
 	# end
 	log_end_msg 0
 }
@@ -75,6 +84,21 @@
 		exit $RET
 	fi
 
+	# filesystems
+	log_progress_msg "filesystems"
+	zfs unshare -a
+	RET=$?
+	if [ $RET != 0 ] ; then
+		log_end_msg $RET
+		exit $RET
+	fi
+	zfs umount -a
+	RET=$?
+	if [ $RET != 0 ] ; then
+		log_end_msg $RET
+		exit $RET
+	fi
+
 	# end
 	log_end_msg 0
 }