]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
Use upstream version of LSB init scripts
authorAron Xu <aron@debian.org>
Mon, 2 Nov 2015 02:45:04 +0000 (10:45 +0800)
committerAron Xu <aron@debian.org>
Mon, 2 Nov 2015 02:45:04 +0000 (10:45 +0800)
debian/rules
debian/zfsutils-linux.install
debian/zfsutils-linux.zfs-mount.init [deleted file]
debian/zfsutils-linux.zfs-share.init [deleted file]
debian/zfsutils-linux.zfs.default [deleted file]

index 1f1c2ddc5fe2a0cdd3cba36f452540894ae10723..d3db8b6415f3869c9296b6427ea957536f4954a0 100755 (executable)
@@ -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)
 
index f5b5b62400032f3ca8631659393962e5f1381c5f..0375f7ae89b420f878fd1b040b5fc180a7769635 100644 (file)
@@ -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 (file)
index 40f7e50..0000000
+++ /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 (file)
index e7ba385..0000000
+++ /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 (file)
index fcfed82..0000000
+++ /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'