2018-11-14 19:48:42 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-10-31 17:40:15 +03:00
|
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
|
|
|
Date: Wed, 31 Oct 2018 15:37:39 +0100
|
|
|
|
|
Subject: [PATCH] Revert "Install init scripts to support non-systemd setups.
|
|
|
|
|
(Closes: #826994)"
|
|
|
|
|
|
|
|
|
|
This reverts commit 2ad6c7f9e150e9c2fa146891785b09465aa0c7e5.
|
|
|
|
|
|
|
|
|
|
Breaks on systems with sysv-rc installed (possible on Jessie upgraded
|
|
|
|
|
systems)
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
|
|
|
---
|
2018-11-14 19:48:42 +03:00
|
|
|
debian/rules | 8 --------
|
|
|
|
|
debian/zfs-zed.zfs-zed.init | 1 -
|
|
|
|
|
debian/zfsutils-linux.zfs-import.init | 1 -
|
|
|
|
|
debian/zfsutils-linux.zfs-mount.init | 1 -
|
|
|
|
|
debian/zfsutils-linux.zfs-share.init | 1 -
|
2018-10-31 17:40:15 +03:00
|
|
|
5 files changed, 12 deletions(-)
|
|
|
|
|
delete mode 120000 debian/zfs-zed.zfs-zed.init
|
|
|
|
|
delete mode 120000 debian/zfsutils-linux.zfs-import.init
|
|
|
|
|
delete mode 120000 debian/zfsutils-linux.zfs-mount.init
|
|
|
|
|
delete mode 120000 debian/zfsutils-linux.zfs-share.init
|
|
|
|
|
|
|
|
|
|
diff --git a/debian/rules b/debian/rules
|
2019-01-30 16:25:27 +03:00
|
|
|
index a7ad2b96b..d6cf5a56f 100755
|
2018-10-31 17:40:15 +03:00
|
|
|
--- a/debian/rules
|
|
|
|
|
+++ b/debian/rules
|
2018-11-14 19:48:42 +03:00
|
|
|
@@ -117,14 +117,6 @@ override_dh_install:
|
2018-10-31 17:40:15 +03:00
|
|
|
find . -name lib*.la -delete
|
|
|
|
|
dh_install --fail-missing
|
|
|
|
|
|
|
|
|
|
-override_dh_installinit:
|
2019-01-30 16:25:27 +03:00
|
|
|
- dh_installinit -R --name zfs-import
|
|
|
|
|
- dh_installinit -R --name zfs-mount
|
|
|
|
|
- dh_installinit -R --name zfs-share
|
|
|
|
|
- dh_installinit -R --name zfs-zed
|
2018-10-31 17:40:15 +03:00
|
|
|
- mkdir -p debian/zfsutils-linux/lib/systemd/system
|
|
|
|
|
- ln -sr /dev/null debian/zfsutils-linux/lib/systemd/system/zfs-import.service
|
|
|
|
|
-
|
|
|
|
|
# ------------
|
|
|
|
|
|
2018-11-14 19:48:42 +03:00
|
|
|
debian-copyright:
|
2018-10-31 17:40:15 +03:00
|
|
|
diff --git a/debian/zfs-zed.zfs-zed.init b/debian/zfs-zed.zfs-zed.init
|
|
|
|
|
deleted file mode 120000
|
2019-01-30 16:25:27 +03:00
|
|
|
index 3f41f6813..000000000
|
2018-10-31 17:40:15 +03:00
|
|
|
--- a/debian/zfs-zed.zfs-zed.init
|
|
|
|
|
+++ /dev/null
|
|
|
|
|
@@ -1 +0,0 @@
|
|
|
|
|
-../etc/init.d/zfs-zed
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
diff --git a/debian/zfsutils-linux.zfs-import.init b/debian/zfsutils-linux.zfs-import.init
|
|
|
|
|
deleted file mode 120000
|
2019-01-30 16:25:27 +03:00
|
|
|
index bfc368fd3..000000000
|
2018-10-31 17:40:15 +03:00
|
|
|
--- a/debian/zfsutils-linux.zfs-import.init
|
|
|
|
|
+++ /dev/null
|
|
|
|
|
@@ -1 +0,0 @@
|
|
|
|
|
-../etc/init.d/zfs-import
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
diff --git a/debian/zfsutils-linux.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init
|
|
|
|
|
deleted file mode 120000
|
2019-01-30 16:25:27 +03:00
|
|
|
index 62a544332..000000000
|
2018-10-31 17:40:15 +03:00
|
|
|
--- a/debian/zfsutils-linux.zfs-mount.init
|
|
|
|
|
+++ /dev/null
|
|
|
|
|
@@ -1 +0,0 @@
|
|
|
|
|
-../etc/init.d/zfs-mount
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
diff --git a/debian/zfsutils-linux.zfs-share.init b/debian/zfsutils-linux.zfs-share.init
|
|
|
|
|
deleted file mode 120000
|
2019-01-30 16:25:27 +03:00
|
|
|
index 3f069f9ba..000000000
|
2018-10-31 17:40:15 +03:00
|
|
|
--- a/debian/zfsutils-linux.zfs-share.init
|
|
|
|
|
+++ /dev/null
|
|
|
|
|
@@ -1 +0,0 @@
|
|
|
|
|
-../etc/init.d/zfs-share
|
|
|
|
|
\ No newline at end of file
|
