Control: retitle -1 Please move /lib/init/vars.sh to sysvinit-utils
Control: tag -1 patch

Hello again,

Martin Pitt [2016-06-03 13:01 +0200]:
> So the part from this proposal/my current patch that remains valid is
> to move vars.sh out of initscripts. We are one procps upload away from
> dropping initscripts out of the default install, and initscripts is by
> far the biggest package. AFAICS we could move this to sysvinit-utils
> for now without breaking any of openrc/file-rc/sysvinit-core/systemd.

Attached git formatted patch does that.

Thanks,

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
>From 0dac2bb4a4f412bf011dfdc0809dace04ad3d399 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.p...@ubuntu.com>
Date: Sat, 4 Jun 2016 00:18:48 +0200
Subject: [PATCH 1/2] Move /lib/init/vars.sh from initscripts to sysvinit-utils

It's not specific to initscripts, but API for other init scripts similar to
/lib/init/init-d-script.

This will allow initscripts to drop from the default installation.

Closes: #826205
---
 debian/changelog                              | 7 +++++++
 debian/control                                | 4 ++--
 debian/sysvinit-utils.install                 | 1 +
 debian/{src/initscripts/lib/init => }/vars.sh | 0
 4 files changed, 10 insertions(+), 2 deletions(-)
 rename debian/{src/initscripts/lib/init => }/vars.sh (100%)

diff --git a/debian/changelog b/debian/changelog
index 13e602c..7478e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
 sysvinit (2.88dsf-60) UNRELEASED; urgency=medium
 
+  [ Andreas Henriksson ]
   * bootlogd: mention it won't do anything under systemd (Closes: #791907)
 
+  [ Martin Pitt ]
+  * Move /lib/init/vars.sh from initscripts to sysvinit-utils. It's not
+    specific to initscripts, but API for other init scripts similar to
+    /lib/init/init-d-script. This will allow initscripts to drop from the
+    default installation. (Closes: #826205)
+
  -- Andreas Henriksson <andr...@fatal.se>  Wed, 25 May 2016 15:58:32 +0200
 
 sysvinit (2.88dsf-59.4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 7add446..4002416 100644
--- a/debian/control
+++ b/debian/control
@@ -56,12 +56,12 @@ Package: sysvinit-utils
 Essential: yes
 Architecture: any
 Conflicts: last, sysvconfig, chkconfig (<< 11.0-79.1-2), startpar (<< 0.58-2)
-Replaces: last, sysvinit (<= 2.86.ds1-65)
+Replaces: last, sysvinit (<= 2.86.ds1-65), initscripts (<< 2.88dsf-59.5)
 Depends: ${shlibs:Depends}, ${misc:Depends}, init-system-helpers (>= 1.25~)
  , startpar
 # sulogin, last, lastb and mesg was moved to the util-linux package
  , util-linux (>> 2.28-2~)
-Breaks: upstart (<< 1.5-0ubuntu5), systemd (<< 215)
+Breaks: upstart (<< 1.5-0ubuntu5), systemd (<< 215), initscripts (<< 2.88dsf-59.5)
 Suggests: bootlogd, sash
 Description: System-V-like utilities
  This package contains the important System-V-like utilities.
diff --git a/debian/sysvinit-utils.install b/debian/sysvinit-utils.install
index ed531fa..0b65091 100644
--- a/debian/sysvinit-utils.install
+++ b/debian/sysvinit-utils.install
@@ -4,3 +4,4 @@ usr/share/man/man8/fstab-decode.8
 usr/share/man/man8/killall5.8
 usr/share/man/man8/pidof.8
 debian/init-d-script lib/init
+debian/vars.sh lib/init
diff --git a/debian/src/initscripts/lib/init/vars.sh b/debian/vars.sh
similarity index 100%
rename from debian/src/initscripts/lib/init/vars.sh
rename to debian/vars.sh
-- 
2.8.1

_______________________________________________
Pkg-systemd-maintainers mailing list
Pkg-systemd-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-systemd-maintainers

Reply via email to