adopt fix-dh-installinit.patch for latest upstream changes

This commit is contained in:
Dietmar Maurer 2015-09-24 13:11:56 +02:00
parent eb4bd3cde8
commit 64d186b910

View File

@ -1,14 +1,8 @@
Index: pkg-zfs/debian/rules
Index: new/debian/rules
===================================================================
--- pkg-zfs.orig/debian/rules
+++ pkg-zfs/debian/rules
@@ -112,12 +112,12 @@ override_dh_installinit:
@# Install the ZED init file.
dh_installinit -pzfsutils --onlyscripts --name=zfs-zed \
- --no-restart-on-upgrade --no-start -- start 07 S . stop 08 0 1 6 .
+ --no-restart-on-upgrade --no-start
--- new.orig/debian/rules
+++ new/debian/rules
@@ -113,7 +113,7 @@ override_dh_installinit:
@# Install the /etc/init.d/zfs-import script.
ifeq ($(LSB_DISTRIBUTOR),Debian)
dh_installinit -pzfsutils --onlyscripts --name=zfs-import \
@ -17,7 +11,7 @@ Index: pkg-zfs/debian/rules
else
dh_installinit -pzfsutils --onlyscripts --name=zfs-import \
--no-restart-on-upgrade --no-start
@@ -127,7 +127,7 @@ endif
@@ -123,7 +123,7 @@ endif
ifeq ($(LSB_DISTRIBUTOR),Debian)
@# Debian runs local mounts at sysv sequences [10..12] [08..09].
dh_installinit -pzfsutils --onlyscripts --name=zfs-mount \
@ -26,7 +20,14 @@ Index: pkg-zfs/debian/rules
else
dh_installinit -pzfsutils --onlyscripts --name=zfs-mount \
--no-restart-on-upgrade --no-start
@@ -137,7 +137,7 @@ endif
@@ -131,13 +131,13 @@ endif
@# 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
@# Install the /etc/init.d/zfs-share script.
ifeq ($(LSB_DISTRIBUTOR),Debian)
@# Debian runs nfs-kernel-server at sysv sequence 17 01.
dh_installinit -pzfsutils --onlyscripts --name=zfs-share \