Add ZED to zfs.redhat.in script

This commit updates the zfs.redhat.in script to start/stop ZED.

Signed-off-by: Chris Dunlap <cdunlap@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #3153
This commit is contained in:
Chris Dunlap 2015-03-05 13:11:05 -08:00 committed by Brian Behlendorf
parent a7b9d0c3a0
commit 0e86d309cc
2 changed files with 7 additions and 0 deletions

View File

@ -15,6 +15,7 @@ $(init_SCRIPTS):
-e 's,@udevruledir\@,$(udevruledir),g' \ -e 's,@udevruledir\@,$(udevruledir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@initdir\@,$(initdir),g' \ -e 's,@initdir\@,$(initdir),g' \
-e 's,@runstatedir\@,$(runstatedir),g' \
'$@.$(DEFAULT_INIT_SCRIPT).in' >'$@' '$@.$(DEFAULT_INIT_SCRIPT).in' >'$@'
distclean-local:: distclean-local::

View File

@ -26,6 +26,8 @@
. /etc/rc.d/init.d/functions . /etc/rc.d/init.d/functions
LOCKFILE=/var/lock/zfs LOCKFILE=/var/lock/zfs
ZED="@sbindir@/zed"
ZED_PIDFILE="@runstatedir@/zed.pid"
ZFS="@sbindir@/zfs" ZFS="@sbindir@/zfs"
ZPOOL="@sbindir@/zpool" ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="/etc/zfs/zpool.cache" ZPOOL_CACHE="/etc/zfs/zpool.cache"
@ -55,6 +57,9 @@ start()
# Load the zfs module stack # Load the zfs module stack
/sbin/modprobe zfs /sbin/modprobe zfs
# Start the ZED for event handling
action $"Starting ZFS Event Daemon" daemon --pidfile="$ZED_PIDFILE" "$ZED"
# Ensure / exists in /etc/mtab, if not update mtab accordingly. # Ensure / exists in /etc/mtab, if not update mtab accordingly.
# This should be handled by rc.sysinit but lets be paranoid. # This should be handled by rc.sysinit but lets be paranoid.
awk '$2 == "/" { exit 1 }' /etc/mtab awk '$2 == "/" { exit 1 }' /etc/mtab
@ -102,6 +107,7 @@ stop()
action $"Unsharing ZFS filesystems" "$ZFS" unshare -a action $"Unsharing ZFS filesystems" "$ZFS" unshare -a
action $"Unmounting ZFS filesystems" "$ZFS" umount -a action $"Unmounting ZFS filesystems" "$ZFS" umount -a
action $"Shutting down ZFS Event Daemon" killproc -p "$ZED_PIDFILE" "$ZED"
rm -f "$LOCKFILE" rm -f "$LOCKFILE"
} }