[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-638-g3dce996
Aron Xu
aron at debian.org
Mon Nov 2 03:09:22 UTC 2015
The following commit has been merged in the master branch:
commit ca31e3695381e3a9f9e6d8b5248712e664d079c8
Author: Aron Xu <aron at debian.org>
Date: Mon Nov 2 10:45:04 2015 +0800
Use upstream version of LSB init scripts
diff --git a/debian/rules b/debian/rules
index 1f1c2dd..d3db8b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,36 +100,6 @@ override_dh_auto_install:
rm $${i}; \
done
-override_dh_installinit:
- @# Install the /etc/default/zfs options file.
- dh_installinit --name=zfs
-
- @# Install the /etc/init.d/zfs-mount script.
-ifeq ($(LSB_DISTRIBUTOR),Debian)
- @# Debian runs local mounts at sysv sequences [10..12] [08..09].
- dh_installinit --name=zfs-mount \
- --no-restart-on-upgrade --no-start -- defaults 13 07
-else
- dh_installinit --name=zfs-mount \
- --no-restart-on-upgrade --no-start
-endif
-
- @# Install the /etc/init.d/zfs-share script.
-ifeq ($(LSB_DISTRIBUTOR),Debian)
- @# Debian runs nfs-kernel-server at sysv sequence 17 01,
- @# iscsitarget at 02 01, and samba at 01 02.
- dh_installinit --name=zfs-share \
- --no-restart-on-upgrade --no-start -- defaults 18 00
-else ifeq ($(LSB_DISTRIBUTOR),Ubuntu)
- @# Ubuntu runs nfs-kernel-server at sysv sequence 20 80,
- @# iscsitarget at 20 20, and samba through upstart.
- dh_installinit --name=zfs-share \
- --no-restart-on-upgrade --no-start -- defaults 25 15
-else
- dh_installinit --name=zfs-share \
- --no-restart-on-upgrade --no-start
-endif
-
override_dh_dkms:
dh_dkms -V $(VERSION)
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index f5b5b62..0375f7a 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -1,5 +1,11 @@
../tree/zfsutils/* /
lib/udev
sbin
+bin
usr/share/man
usr/lib/modules-load.d/zfs.conf
+etc/default/zfs
+etc/init.d/zfs-*
+etc/zfs/*
+usr/share/zfs/*
+usr/lib/systemd/
diff --git a/debian/zfsutils-linux.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init
deleted file mode 100644
index 40f7e50..0000000
--- a/debian/zfsutils-linux.zfs-mount.init
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: zvol zfs zfs-mount
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mount ZFS filesystems
-# Description: Run the `zfs mount -a` or `zfs umount -a` command.
-# This init script is deprecated and should be disabled in the
-# /etc/default/zfs options file. Instead, use the zfs-mount
-# package for Debian or the zfs-mountall package for Ubuntu
-### END INIT INFO
-
-PATH=/sbin:/bin
-
-. /lib/lsb/init-functions
-# 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
-
-do_start()
-{
- log_begin_msg "Mounting ZFS filesystems"
- log_progress_msg "filesystems"
- zfs mount -a
- RET=$?
-
- if [ $RET != 0 ] ; then
- log_end_msg $RET
- exit $RET
- fi
-
- log_end_msg 0
-}
-
-do_stop()
-{
- log_begin_msg "Unmounting ZFS filesystems"
- log_progress_msg "filesystems"
- zfs unmount -a
- RET=$?
-
- # Ignore a non-zero `zfs` result so that a busy ZFS instance
- # does not hang the system during shutdown.
- if [ $RET != 0 ] ; then
- log_end_msg $RET
- fi
-
- log_end_msg 0
-}
-
-case "$1" in
- (start)
- case "$ZFS_MOUNT" in
- ([Oo][Ff][Ff]|[Nn][Oo]|'')
- exit 0
- ;;
- esac
- do_start
- ;;
- (stop)
- case "$ZFS_UNMOUNT" in
- ([Oo][Ff][Ff]|[Nn][Oo]|'')
- exit 0
- ;;
- esac
- do_stop
- ;;
- (force-reload|reload|restart|status)
- # no-op
- ;;
-
- (*)
- [ -n "$1" ] && echo "Error: Unknown command $1."
- echo "Usage: $0 {start|stop}"
- exit 3
- ;;
-esac
diff --git a/debian/zfsutils-linux.zfs-share.init b/debian/zfsutils-linux.zfs-share.init
deleted file mode 100644
index e7ba385..0000000
--- a/debian/zfsutils-linux.zfs-share.init
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides: shareiscsi sharenfs sharesmb zfs-share
-# Required-Start: $local_fs $network $remote_fs
-# Required-Stop: $local_fs $network $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Should-Start: iscsi iscsitarget istgt nfs-kernel-server samba
-# Should-Stop: iscsi iscsitarget istgt nfs-kernel-server samba
-# Short-Description: Network share ZFS datasets.
-# Description: Run the `zfs share -a` or `zfs unmount -a` commands
-# for controlling iSCSI, NFS, or CIFS network shares.
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-. /lib/lsb/init-functions
-# 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
-
-do_start()
-{
- log_begin_msg "Sharing ZFS filesystems"
- log_progress_msg "filesystems"
- zfs share -a
- RET=$?
-
- if [ $RET != 0 ] ; then
- log_end_msg $RET
- exit $RET
- fi
-
- log_end_msg 0
-}
-
-do_stop()
-{
- log_begin_msg "Unsharing ZFS filesystems"
- log_progress_msg "filesystems"
- zfs unshare -a
- RET=$?
-
- # Ignore a non-zero `zfs` result so that a busy ZFS instance
- # does not hang the system during shutdown.
- if [ $RET != 0 ] ; then
- log_end_msg $RET
- fi
-
- log_end_msg 0
-}
-
-case "$1" in
- (start)
- case "$ZFS_SHARE" in
- ([Oo][Ff][Ff]|[Nn][Oo]|'')
- exit 0
- ;;
- esac
- do_start
- ;;
- (stop)
- case "$ZFS_UNSHARE" in
- ([Oo][Ff][Ff]|[Nn][Oo]|'')
- exit 0
- ;;
- esac
- do_stop
- ;;
- (force-reload|reload|restart|status)
- # no-op
- ;;
-
- (*)
- [ -n "$1" ] && echo "Error: Unknown command $1."
- echo "Usage: $0 {start|stop}"
- exit 3
- ;;
-esac
diff --git a/debian/zfsutils-linux.zfs.default b/debian/zfsutils-linux.zfs.default
deleted file mode 100644
index fcfed82..0000000
--- a/debian/zfsutils-linux.zfs.default
+++ /dev/null
@@ -1,29 +0,0 @@
-# ZoL userland configuration.
-
-# Run `zfs mount -a` during system start?
-# This should be 'no' if zfs-mountall or a systemd generator is available.
-ZFS_MOUNT='no'
-
-# Run `zfs unmount -a` during system stop?
-# This should be 'no' on most systems.
-ZFS_UNMOUNT='no'
-
-# Run `zfs share -a` during system start?
-# nb: The shareiscsi, sharenfs, and sharesmb dataset properties.
-ZFS_SHARE='no'
-
-# Run `zfs unshare -a` during system stop?
-ZFS_UNSHARE='no'
-
-# Build kernel modules with the --enable-debug switch?
-ZFS_DKMS_ENABLE_DEBUG='no'
-
-# Build kernel modules with the --enable-debug-dmu-tx switch?
-ZFS_DKMS_ENABLE_DEBUG_DMU_TX='no'
-
-# Keep debugging symbols in kernel modules?
-ZFS_DKMS_DISABLE_STRIP='no'
-
-# Wait for this many seconds in the initrd pre_mountroot?
-# This delays startup and should be '0' on most systems.
-ZFS_INITRD_PRE_MOUNTROOT_SLEEP='0'
--
ZFS on Linux
More information about the Pkg-zfsonlinux-devel
mailing list