From b79e1f1f27e72e0603beb176c9d8e4c78bc62c95 Mon Sep 17 00:00:00 2001
From: Turbo Fredriksson <turbo@bayour.com>
Date: Mon, 3 Feb 2014 21:54:40 +0000
Subject: [PATCH] Allow specifying '-o <opts>' in defaults/init script.

Signed-off-by: Turbo Fredriksson <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #2103
---
 etc/init.d/zfs.lsb.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in
index a0f3a647d..e626f7905 100644
--- a/etc/init.d/zfs.lsb.in
+++ b/etc/init.d/zfs.lsb.in
@@ -32,6 +32,7 @@ ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 USE_DISK_BY_ID=0
 VERBOSE_MOUNT=0
 DO_OVERLAY_MOUNTS=0
+MOUNT_EXTRA_OPTIONS=""
 
 # Source zfs configuration.
 [ -r '/etc/default/zfs' ] &&  . /etc/default/zfs
@@ -96,7 +97,7 @@ start()
 		fi
 
 		log_begin_msg "Mounting ZFS filesystems"
-		"$ZFS" mount -a$verbose$overlay
+		"$ZFS" mount -a$verbose$overlay$MOUNT_EXTRA_OPTIONS
 		log_end_msg $?
 
 		log_begin_msg "Exporting ZFS filesystems"