Remove sourcing of /etc/init/vars.sh

Since the removal of /etc/init/rw, /etc/init/*.sh are treated as
internal APIs so that should not be sourced. The line is kept for
ease of back porting.

diff --git a/debian/zfsutils.zfs-mount.init b/debian/zfsutils.zfs-mount.init
index 4881baefecccf281b727808f855c7c514b0b7eab..40f7e50bfea974adb33554acc7a36395fcb62a54 100644 (file)
--- a/debian/zfsutils.zfs-mount.init
+++ b/debian/zfsutils.zfs-mount.init
@@ -16,7 +16,11 @@
 PATH=/sbin:/bin
 
 . /lib/lsb/init-functions
-. /lib/init/vars.sh
+# Do not source /lib/init/*.sh as they are not public APIs after getting rid
+# of /lib/init/rw. However, this line may help when doing back port to older
+# releases.
+#
+#. /lib/init/vars.sh
 
 [ -f /etc/default/zfs ] && . /etc/default/zfs
 

diff --git a/debian/zfsutils.zfs-share.init b/debian/zfsutils.zfs-share.init
index ce3fa9318350aa3b8ded77f9548c89c3b233bc63..d661d3fc00805d6b450f964c0493fdfdaf2a154d 100644 (file)
--- a/debian/zfsutils.zfs-share.init
+++ b/debian/zfsutils.zfs-share.init
@@ -16,7 +16,11 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 . /lib/lsb/init-functions
-. /lib/init/vars.sh
+# Do not source /lib/init/*.sh as they are not public APIs after getting rid
+# of /lib/init/rw. However, this line may help when doing back port to older
+# releases.
+#
+#. /lib/init/vars.sh
 
 [ -f /etc/default/zfs ] && . /etc/default/zfs