]>
Commit | Line | Data |
---|---|---|
851f3685 TL |
1 | From c37a6401469cae16519db06d623d49c6f606f312 Mon Sep 17 00:00:00 2001 |
2 | From: Thomas Lamprecht <t.lamprecht@proxmox.com> | |
3 | Date: Wed, 31 Oct 2018 15:37:39 +0100 | |
4 | Subject: [PATCH] Revert "Install init scripts to support non-systemd setups. | |
5 | (Closes: #826994)" | |
6 | ||
7 | This reverts commit 2ad6c7f9e150e9c2fa146891785b09465aa0c7e5. | |
8 | ||
9 | Breaks on systems with sysv-rc installed (possible on Jessie upgraded | |
10 | systems) | |
11 | ||
12 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> | |
13 | --- | |
14 | debian/rules | 8 -------- | |
15 | debian/zfs-zed.zfs-zed.init | 1 - | |
16 | debian/zfsutils-linux.zfs-import.init | 1 - | |
17 | debian/zfsutils-linux.zfs-mount.init | 1 - | |
18 | debian/zfsutils-linux.zfs-share.init | 1 - | |
19 | 5 files changed, 12 deletions(-) | |
20 | delete mode 120000 debian/zfs-zed.zfs-zed.init | |
21 | delete mode 120000 debian/zfsutils-linux.zfs-import.init | |
22 | delete mode 120000 debian/zfsutils-linux.zfs-mount.init | |
23 | delete mode 120000 debian/zfsutils-linux.zfs-share.init | |
24 | ||
25 | diff --git a/debian/rules b/debian/rules | |
26 | index 5fba58ff..81c301e4 100644 | |
27 | --- a/debian/rules | |
28 | +++ b/debian/rules | |
29 | @@ -161,14 +153,6 @@ override_dh_install: | |
30 | find . -name lib*.la -delete | |
31 | dh_install --fail-missing | |
32 | ||
33 | -override_dh_installinit: | |
34 | - dh_installinit -r --no-start --name zfs-import | |
35 | - dh_installinit -r --no-start --name zfs-mount | |
36 | - dh_installinit -r --no-start --name zfs-share | |
37 | - dh_installinit -R --no-start --name zfs-zed | |
38 | - mkdir -p debian/zfsutils-linux/lib/systemd/system | |
39 | - ln -sr /dev/null debian/zfsutils-linux/lib/systemd/system/zfs-import.service | |
40 | - | |
41 | # ------------ | |
42 | ||
43 | override_dh_prep-deb-files: | |
44 | diff --git a/debian/zfs-zed.zfs-zed.init b/debian/zfs-zed.zfs-zed.init | |
45 | deleted file mode 120000 | |
46 | index 3f41f681..00000000 | |
47 | --- a/debian/zfs-zed.zfs-zed.init | |
48 | +++ /dev/null | |
49 | @@ -1 +0,0 @@ | |
50 | -../etc/init.d/zfs-zed | |
51 | \ No newline at end of file | |
52 | diff --git a/debian/zfsutils-linux.zfs-import.init b/debian/zfsutils-linux.zfs-import.init | |
53 | deleted file mode 120000 | |
54 | index bfc368fd..00000000 | |
55 | --- a/debian/zfsutils-linux.zfs-import.init | |
56 | +++ /dev/null | |
57 | @@ -1 +0,0 @@ | |
58 | -../etc/init.d/zfs-import | |
59 | \ No newline at end of file | |
60 | diff --git a/debian/zfsutils-linux.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init | |
61 | deleted file mode 120000 | |
62 | index 62a54433..00000000 | |
63 | --- a/debian/zfsutils-linux.zfs-mount.init | |
64 | +++ /dev/null | |
65 | @@ -1 +0,0 @@ | |
66 | -../etc/init.d/zfs-mount | |
67 | \ No newline at end of file | |
68 | diff --git a/debian/zfsutils-linux.zfs-share.init b/debian/zfsutils-linux.zfs-share.init | |
69 | deleted file mode 120000 | |
70 | index 3f069f9b..00000000 | |
71 | --- a/debian/zfsutils-linux.zfs-share.init | |
72 | +++ /dev/null | |
73 | @@ -1 +0,0 @@ | |
74 | -../etc/init.d/zfs-share | |
75 | \ No newline at end of file | |
76 | -- | |
77 | 2.19.1 | |
78 |