Support for runlevels

4 files changed, 26 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index 079282d..a859bac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-dh-runit (0.2) UNRELEASED; urgency=medium
+dh-runit (0.3) UNRELEASED; urgency=medium
+
+  * Support for `runlevels'. Now, runscripts are installed for
+    `runlevel' default, but system adminstrator can create more.
+
+ -- Dmitry Bogatov <KAction@gnu.org>  Fri, 15 Jul 2016 09:45:08 +0300
+
+dh-runit (0.2) unstable; urgency=medium
 
   * Change arch:any to arch:all. Perl script is arch-independent.
 
- -- Dmitry Bogatov <KAction@gnu.org>  Wed, 15 Jun 2016 09:51:46 +0300
+ -- Dmitry Bogatov <KAction@gnu.org>  Fri, 15 Jul 2016 09:45:04 +0300
 
 dh-runit (0.1) unstable; urgency=medium
 
diff --git a/dh_runit b/dh_runit
index fa19763..01bbf67 100755
--- a/dh_runit
+++ b/dh_runit
@@ -89,6 +89,7 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) {
         }
         make_symlink("/etc/sv/$name/supervise",
                      "/var/lib/runit/supervise/$name", $tmp);
+        install_dir("/var/lib/runit/supervise/$name");
 
         if ($enable eq 'enable' && !$dh{NO_ENABLE}) {
             runit_autoscript($pkg, 'postinst', "s/#NAME#/$name/");
diff --git a/postinst-runit b/postinst-runit
index 1955857..8b5887c 100644
--- a/postinst-runit
+++ b/postinst-runit
@@ -1,3 +1,2 @@
-SV_DIR=/etc/service
-ln -sf '/etc/sv/#NAME#' "$SV_DIR/"
-mkdir -p '/var/lib/runit/supervise/#NAME#'
+SV_DEFAULT=/etc/runit/runsvdir/default
+ln -sf '/etc/sv/#NAME#' "$SV_DEFAULT"
diff --git a/preinst-runit b/preinst-runit
index 19f959b..62feed4 100644
--- a/preinst-runit
+++ b/preinst-runit
@@ -1,20 +1,22 @@
 # -*- shell-script -*-
-SV_ABS_DIR=/var/lib/runit/service
+SV_CURRENT=/etc/runit/runsvdir/current
+SV_DEFAULT=/etc/runit/runsvdir/default
 SV_DIR=/etc/service
-mkdir -p "$SV_ABS_DIR"
-if [ ! -e "$SV_DIR" ] ; then
-    ln -s "$SV_ABS_DIR" "$SV_DIR"
+
+mkdir -p "$SV_DEFAULT"
+if [ ! -e "$SV_CURRENT" ] ; then
+    ln -s default "$SV_CURRENT"
+elif [ ! -L "$SV_CURRENT" ] ; then
+    echo "unsupported: $SV_CURRENT exists, but is not symbolic link"
+    exit 1
 fi
 
-if [ "$(readlink -f "$SV_DIR")" != "$SV_ABS_DIR" ] ; then
-    cat <<EOF
-Service directory '$SV_DIR' exists, but is not symbolic link
-to '$SV_ABS_DIR'. It probably means that it was created by
-hand or versions of runit below 2.1.2-4.
+if [ ! -e "$SV_DIR" ] ; then
+    ln -sn "$SV_CURRENT" "$SV_DIR"
+fi
 
-In either case, please remove service directory yourself and
-restart installation.
-EOF
+if [ "$(readlink "$SV_DIR")" != "$SV_CURRENT" ] ; then
+    echo "unsupported: $SV_DIR exists, but does not point to $SV_CURRENT"
     exit 1
 fi