From d55b74edb508e4795b4a4e511e92089f3af2fad4 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@gnu.org>
Date: Thu, 2 Mar 2017 12:58:55 +0300
Subject: Remove 'logdir' option for simplicity sake. Strictly speaking it is
 backward-incompatible change, hence the version major bump, but I am unaware
 of any actual users of this option.

---
 debian/changelog | 5 ++++-
 dh_runit         | 8 +-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b55583b..1bd9759 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-dh-runit (1.6.3) UNRELEASED; urgency=medium
+dh-runit (2.7) UNRELEASED; urgency=medium
 
   * Change naming of generated system users for logging to start
     with underscore.
   * Add missing dependency on dh-sysuser.
   * Improve readability of code, generating /etc/sv/<daemon>/log/run
     script using here-doc notation.
+  * Remove 'logdir' option for simplicity sake. Strictly speaking it is
+    backward-incompatible change, hence the version major bump, but I am
+    unaware of any actual users of this option.
 
  -- Dmitry Bogatov <KAction@gnu.org>  Wed, 01 Mar 2017 18:38:17 +0300
 
diff --git a/dh_runit b/dh_runit
index 876b23a..3be25bb 100755
--- a/dh_runit
+++ b/dh_runit
@@ -16,7 +16,6 @@ sub parse_options($opts) {
             when (/^disable$/)     { $conf->{enable} = 0; };
             when (/^name=(.*)$/)   { $conf->{name} = $1; };
             when (/^logscript$/)   { $conf->{logscript} = 1};
-            when (/^logdir=(.*)$/) { $conf->{logdir} = $1 };
             when (/^defaults$/)    { "do nothing"; };
             default                { error("unknown option `$opt'"); }
         }
@@ -79,7 +78,7 @@ PKG: foreach my $pkg (@{$dh{DOPACKAGES}}) {
         }
         runit_autoscript($pkg, 'postrm', "s/#NAME#/$name/");
         if ($conf->{logscript}) {
-            my $logdir = $conf->{logdir} || "/var/log/runit/$name";
+            my $logdir = "/var/log/runit/$name";
 
             install_dir("$sv_dir/$name/log");
             install_dir($tmp . $logdir);
@@ -158,11 +157,6 @@ is error, following are supported:
     rights of dedicated user. It is error, if first argument in pair
     is directory, which already contains F</log/run> script.
 
-=item I<logdir>=/path/to/log/directory
-
-    This option is meaningful only with I<logscript>. It allows
-    overriding default log directory F</var/log/runit/I<name>>.
-
 =item I<defaults>
 
     If you need no other options, put this one.
-- 
cgit v1.2.3