diff options
author | Dmitry Bogatov <KAction@gnu.org> | 2016-08-31 14:02:13 +0300 |
---|---|---|
committer | Dmitry Bogatov <KAction@gnu.org> | 2016-08-31 14:02:13 +0300 |
commit | f4ab345fd51a86db9eccc7231bdd16db375ea2d0 (patch) | |
tree | 7c03557697b58add8dd4491951c1d9ae6a096c62 | |
parent | d81572d639a310ba44ffa388aaab9dbe057d535d (diff) |
Do not create /etc/runit/runsvdir/default directory. Instead, it is provided by runit binary package. It saved us trouble of ensuring, that directory is removed at apporiate time.
-rw-r--r-- | debian/changelog | 8 | ||||
-rwxr-xr-x | dh_runit | 2 | ||||
-rw-r--r-- | postinst-runit | 3 | ||||
-rw-r--r-- | preinst-runit | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index fbc4b7f..3b6d29f 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,11 @@ | |||
1 | dh-runit (1.6) UNRELEASED; urgency=medium | ||
2 | |||
3 | * Do not create /etc/runit/runsvdir/default directory. Instead, it is | ||
4 | provided by runit binary package. It saved us trouble of ensuring, | ||
5 | that directory is removed at apporiate time. | ||
6 | |||
7 | -- Dmitry Bogatov <KAction@gnu.org> Wed, 31 Aug 2016 14:00:10 +0300 | ||
8 | |||
1 | dh-runit (1.5) unstable; urgency=medium | 9 | dh-runit (1.5) unstable; urgency=medium |
2 | 10 | ||
3 | * Breaking change package.runit file format to improve interoperability | 11 | * Breaking change package.runit file format to improve interoperability |
@@ -99,7 +99,7 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) { | |||
99 | install_dir("$tmp/var/lib/runit/log/supervise/$name"); | 99 | install_dir("$tmp/var/lib/runit/log/supervise/$name"); |
100 | } | 100 | } |
101 | } | 101 | } |
102 | addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-4'); | 102 | addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-7'); |
103 | } | 103 | } |
104 | 104 | ||
105 | # PROMISE: DH NOOP WITHOUT runit | 105 | # PROMISE: DH NOOP WITHOUT runit |
diff --git a/postinst-runit b/postinst-runit index 8b5887c..44b062e 100644 --- a/postinst-runit +++ b/postinst-runit | |||
@@ -1,2 +1 @@ | |||
1 | SV_DEFAULT=/etc/runit/runsvdir/default | ln -sf '/etc/sv/#NAME#' /etc/runit/runsvdir/default | |
2 | ln -sf '/etc/sv/#NAME#' "$SV_DEFAULT" | ||
diff --git a/preinst-runit b/preinst-runit index 62feed4..23d8792 100644 --- a/preinst-runit +++ b/preinst-runit | |||
@@ -3,7 +3,6 @@ SV_CURRENT=/etc/runit/runsvdir/current | |||
3 | SV_DEFAULT=/etc/runit/runsvdir/default | 3 | SV_DEFAULT=/etc/runit/runsvdir/default |
4 | SV_DIR=/etc/service | 4 | SV_DIR=/etc/service |
5 | 5 | ||
6 | mkdir -p "$SV_DEFAULT" | ||
7 | if [ ! -e "$SV_CURRENT" ] ; then | 6 | if [ ! -e "$SV_CURRENT" ] ; then |
8 | ln -s default "$SV_CURRENT" | 7 | ln -s default "$SV_CURRENT" |
9 | elif [ ! -L "$SV_CURRENT" ] ; then | 8 | elif [ ! -L "$SV_CURRENT" ] ; then |