c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not install sysv init scripts

Browse Source 
to avoid double startup with systemd
This commit is contained in:
Dietmar Maurer 2015-09-28 10:15:48 +02:00
parent 64d186b910
commit 3435683847
3 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@ RELEASE=4.0
# source form https://github.com/zfsonlinux/
ZFSVER=0.6.5
ZFSPKGREL=pve2~jessie
ZFSPKGREL=pve3~jessie
SPLPKGREL=pve1~jessie
ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
SPLPKGVER=${ZFSVER}-${SPLPKGREL}

7
zfs-changelog.Debian
View File

@ -1,3 +1,10 @@
zfs-linux (0.6.5-pve3~jessie) unstable; urgency=medium
* do not install /etc/init.d/zfs-zed script to avoid double startup
with systemd
-- Proxmox Support Team <support@proxmox.com> Mon, 28 Sep 2015 10:14:40 +0200
zfs-linux (0.6.5-pve2~jessie) unstable; urgency=medium
* update to master/debian/jessie/0.6.5.1-4

68
zfs-patches/fix-dh-installinit.patch
View File

@ -1,3 +1,13 @@
Do not install sysv init scripts
We use systemd on PVE, so there is no need to install old sysv init scripts.
Also, provided scripts are buggy, because they do not
include /lib/lsb/init-functions, thus do not call systemctl to start
services.
Adittionally, service names differ, so some services are started
twice (zed => zfs-zed).
Index: new/debian/rules
===================================================================
--- new.orig/debian/rules
@ -11,7 +21,7 @@ Index: new/debian/rules
else
dh_installinit -pzfsutils --onlyscripts --name=zfs-import \
--no-restart-on-upgrade --no-start
@@ -123,7 +123,7 @@ endif
@@ -123,21 +123,23 @@ endif
ifeq ($(LSB_DISTRIBUTOR),Debian)
@# Debian runs local mounts at sysv sequences [10..12] [08..09].
dh_installinit -pzfsutils --onlyscripts --name=zfs-mount \
@ -20,12 +30,16 @@ Index: new/debian/rules
else
dh_installinit -pzfsutils --onlyscripts --name=zfs-mount \
--no-restart-on-upgrade --no-start
@@ -131,13 +131,13 @@ endif
endif
@# Install the ZED init file.
dh_installinit -pzfsutils --onlyscripts --name=zfs-zed \
- @# Install the ZED init file.
- dh_installinit -pzfsutils --onlyscripts --name=zfs-zed \
- --no-restart-on-upgrade --no-start -- start 07 2 3 4 5 . stop 08 0 1 6 .
+ --no-restart-on-upgrade --no-start
+ # zed is started with systemd zed.service
+ # so do not install zfs-zed init script
+ #@# Install the ZED init file.
+ #dh_installinit -pzfsutils --onlyscripts --name=zfs-zed \
+ # --no-restart-on-upgrade --no-start
@# Install the /etc/init.d/zfs-share script.
ifeq ($(LSB_DISTRIBUTOR),Debian)
@ -36,3 +50,47 @@ Index: new/debian/rules
else ifeq ($(LSB_DISTRIBUTOR),Ubuntu)
@# Ubuntu runs nfs-kernel-server at sysv sequence 20 80.
@# iscsitarget at 20 20, and samba through upstart.
Index: new/debian/zfsutils.install
===================================================================
--- new.orig/debian/zfsutils.install
+++ new/debian/zfsutils.install
@@ -1,9 +1,5 @@
../tree/zfsutils/* /
contrib/bash_completion.d/zfs /etc/bash_completion.d/
-contrib/sysv-init/zfs-import /etc/init.d/
-contrib/sysv-init/zfs-mount /etc/init.d/
-contrib/sysv-init/zfs-share /etc/init.d/
-contrib/sysv-init/zfs-zed /etc/init.d/
lib/udev
sbin
usr/share/man
Index: new/debian/zfsutils.postinst
===================================================================
--- new.orig/debian/zfsutils.postinst
+++ new/debian/zfsutils.postinst
@@ -10,6 +10,10 @@ then
dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
fi
#DEBHELPER#
Index: new/debian/zfsutils.preinst
===================================================================
--- new.orig/debian/zfsutils.preinst
+++ new/debian/zfsutils.preinst
@@ -6,6 +6,10 @@ then
dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
fi
#DEBHELPER#