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

[Robert Millan]

Author: rmh
Date: 2011-11-12 10:53:39 +0000 (Sat, 12 Nov 2011)
New Revision: 3851

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/zfsutils.zfs.init
Log:
Do not attempt to unmount /, as this always fails.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-11-12 10:51:21 UTC (rev 3850)
+++ trunk/zfsutils/debian/changelog	2011-11-12 10:53:39 UTC (rev 3851)
@@ -1,3 +1,9 @@
+zfsutils (8.3~svn226546-3) UNRELEASED; urgency=low
+
+  * Do not attempt to unmount /, as this always fails.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 12 Nov 2011 11:53:18 +0100
+
 zfsutils (8.3~svn226546-2) unstable; urgency=low
 
   [ Robert Millan ]

Modified: trunk/zfsutils/debian/zfsutils.zfs.init
===================================================================
--- trunk/zfsutils/debian/zfsutils.zfs.init	2011-11-12 10:51:21 UTC (rev 3850)
+++ trunk/zfsutils/debian/zfsutils.zfs.init	2011-11-12 10:53:39 UTC (rev 3851)
@@ -74,12 +74,22 @@
 		log_end_msg $RET
 		exit $RET
 	fi
-	zfs umount -a
-	RET=$?
-	if [ $RET != 0 ] ; then
-		log_end_msg $RET
-		exit $RET
-	fi
+	zfs mount | \
+	while read name mountpoint; do
+		case "${mountpoint}" in
+		/)
+			# / can't be unmounted, skip.
+		;;
+		*)
+			zfs umount ${name}
+			RET=$?
+			if [ $RET != 0 ] ; then
+				log_end_msg $RET
+				exit $RET
+			fi
+		;;
+		esac
+	done
 
 	# end
 	log_end_msg 0