From 382c4e5184c9caa25e85f277564657243db2a150 Mon Sep 17 00:00:00 2001 From: Turbo Fredriksson Date: Sun, 14 Apr 2013 17:41:51 +0200 Subject: [PATCH] Possibility to disable (not start) zfs at bootup. Signed-off-by: Brian Behlendorf Issue #1402 --- etc/init.d/zfs.fedora.in | 5 +++++ etc/init.d/zfs.gentoo.in | 5 +++++ etc/init.d/zfs.lsb.in | 5 +++++ etc/init.d/zfs.lunar.in | 5 +++++ etc/init.d/zfs.redhat.in | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/etc/init.d/zfs.fedora.in b/etc/init.d/zfs.fedora.in index 04f2077..3cece9b 100644 --- a/etc/init.d/zfs.fedora.in +++ b/etc/init.d/zfs.fedora.in @@ -25,6 +25,11 @@ export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin +if [ -z "$init" ]; then + # Not interactive + grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3 +fi + # Source function library & LSB routines . /etc/rc.d/init.d/functions diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in index df883cf..5b8671e 100644 --- a/etc/init.d/zfs.gentoo.in +++ b/etc/init.d/zfs.gentoo.in @@ -3,6 +3,11 @@ # Released under the 2-clause BSD license. # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs,v 0.9 2011/04/30 10:13:43 devsk Exp $ +if [ -z "$init" ]; then + # Not interactive + grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3 +fi + depend() { # bootmisc will log to /var which may be a different zfs than root. diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in index 3d04206..0d0ffb4 100644 --- a/etc/init.d/zfs.lsb.in +++ b/etc/init.d/zfs.lsb.in @@ -36,6 +36,11 @@ ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache" [ -x "$ZPOOL" ] || exit 1 [ -x "$ZFS" ] || exit 2 +if [ -z "$init" ]; then + # Not interactive + grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3 +fi + start() { [ -f "$LOCKFILE" ] && return 3 diff --git a/etc/init.d/zfs.lunar.in b/etc/init.d/zfs.lunar.in index 97384dc..3cf79ce 100644 --- a/etc/init.d/zfs.lunar.in +++ b/etc/init.d/zfs.lunar.in @@ -14,6 +14,11 @@ ZFS="@sbindir@/zfs" ZPOOL="@sbindir@/zpool" ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache" +if [ -z "$init" ]; then + # Not interactive + grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3 +fi + case $1 in start) echo "$1ing ZFS filesystems" diff --git a/etc/init.d/zfs.redhat.in b/etc/init.d/zfs.redhat.in index ae797c1..fb5187f 100644 --- a/etc/init.d/zfs.redhat.in +++ b/etc/init.d/zfs.redhat.in @@ -25,6 +25,11 @@ export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin +if [ -z "$init" ]; then + # Not interactive + grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3 +fi + # Source function library & LSB routines . /etc/rc.d/init.d/functions -- 1.8.3.1