From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 3 Jul 2011 00:43:25 +0000 (+0200)
Subject: Updated init scripts to enable automatic sharing of ZFS datasets.
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=8b0cf399ff9e764a08faea654bd30043a861cb09;p=zfs.git

Updated init scripts to enable automatic sharing of ZFS datasets.

The relevant init scripts were updated so as to automatically share
ZFS datasets using "zfs share -a" at boot time.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
---

diff --git a/etc/init.d/zfs.fedora b/etc/init.d/zfs.fedora
index bfed452..70b7281 100644
--- a/etc/init.d/zfs.fedora
+++ b/etc/init.d/zfs.fedora
@@ -158,6 +158,8 @@ start()
 	
 	action $"Mounting ZFS filesystems not yet mounted: " $ZFS mount -a || return 152
 
+	action $"Exporting ZFS filesystems: " $ZFS share -a || return 153
+
 	read_mtab  "^/dev/zd"
 	read_fstab "^/dev/zd"
 
diff --git a/etc/init.d/zfs.gentoo b/etc/init.d/zfs.gentoo
index d7e1d10..f709ed9 100644
--- a/etc/init.d/zfs.gentoo
+++ b/etc/init.d/zfs.gentoo
@@ -77,6 +77,15 @@ start() {
 		return $rv
 	fi
 
+	einfo "Exporting ZFS filesystems"
+	$ZFS share -a
+	rv=$?
+	if [ $rv -ne 0 ]; then
+		eerror "Failed to export ZFS filesystems."
+		eend $rv
+		return $rv
+	fi
+
 	eend 0
 	return 0
 }
diff --git a/etc/init.d/zfs.lsb b/etc/init.d/zfs.lsb
index c342a6b..ce541a9 100644
--- a/etc/init.d/zfs.lsb
+++ b/etc/init.d/zfs.lsb
@@ -74,6 +74,10 @@ start()
 		log_begin_msg "Mounting ZFS filesystems"
 		$ZFS mount -a
 		log_end_msg $?
+
+		log_begin_msg "Exporting ZFS filesystems"
+		$ZFS share -a
+		log_end_msg $?
 	fi
 	
 	touch $LOCKFILE
diff --git a/etc/init.d/zfs.lunar b/etc/init.d/zfs.lunar
index c77b2b7..bdc461a 100644
--- a/etc/init.d/zfs.lunar
+++ b/etc/init.d/zfs.lunar
@@ -42,6 +42,14 @@ case $1 in
       fi
     done < <(zfs list -H);
 
+    # export the filesystems
+    echo -n "exporting ZFS filesystems..."
+    if zfs share -a; then
+      echo -e "done";
+    else
+      echo -e "failed";
+    fi
+
 
   ;;
 
diff --git a/etc/init.d/zfs.redhat b/etc/init.d/zfs.redhat
index 3f34f2f..c1f2fb8 100644
--- a/etc/init.d/zfs.redhat
+++ b/etc/init.d/zfs.redhat
@@ -87,6 +87,8 @@ start()
 
 	action $"Mounting automounted ZFS filesystems: " $ZFS mount -a || return 152
 
+	action $"Exporting ZFS filesystems: " $ZFS share -a || return 153
+
 	# Read fstab, try to mount zvols ignoring error
 	read_fstab "^/dev/(zd|zvol)"
 	template=$"Mounting volume %s registered in fstab: "