From f4ab345fd51a86db9eccc7231bdd16db375ea2d0 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Wed, 31 Aug 2016 14:02:13 +0300 Subject: 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. --- debian/changelog | 8 ++++++++ dh_runit | 2 +- postinst-runit | 3 +-- 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 @@ +dh-runit (1.6) UNRELEASED; urgency=medium + + * 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. + + -- Dmitry Bogatov Wed, 31 Aug 2016 14:00:10 +0300 + dh-runit (1.5) unstable; urgency=medium * Breaking change package.runit file format to improve interoperability diff --git a/dh_runit b/dh_runit index 28c9d86..6bce272 100755 --- a/dh_runit +++ b/dh_runit @@ -99,7 +99,7 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) { install_dir("$tmp/var/lib/runit/log/supervise/$name"); } } - addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-4'); + addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-7'); } # 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 @@ -SV_DEFAULT=/etc/runit/runsvdir/default -ln -sf '/etc/sv/#NAME#' "$SV_DEFAULT" +ln -sf '/etc/sv/#NAME#' /etc/runit/runsvdir/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 SV_DEFAULT=/etc/runit/runsvdir/default SV_DIR=/etc/service -mkdir -p "$SV_DEFAULT" if [ ! -e "$SV_CURRENT" ] ; then ln -s default "$SV_CURRENT" elif [ ! -L "$SV_CURRENT" ] ; then -- cgit v1.2.3