[SCM] live-config branch, debian-next, updated. debian/2.0_a15-1-14-g3a28bbc
Daniel Baumann
daniel at debian.org
Thu Jul 29 15:00:36 UTC 2010
The following commit has been merged in the debian-next branch:
commit 24dccf7604c2dfbc15088455e7ea63f31fdf3610
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jul 29 16:48:23 2010 +0200
Splitting out runit backend to own package.
diff --git a/debian/control b/debian/control
index 497108e..73c4691 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,18 @@ Description: Debian Live - System Configuration Scripts
In addition to live-config, a backend for an init system is required, such as
live-config-sysvinit.
+Package: live-config-runit
+Architecture: all
+Depends: ${misc:Depends}, runit-run
+Conflicts: live-config-backend
+Replaces: live-config-backend
+Provides: live-config-backend
+Description: Debian Live - System Configuration Scripts (runit backend)
+ live-config contains the scripts that configure a Debian Live system during
+ the boot process (late userspace).
+ .
+ This package contains the runit backend (experimental!).
+
Package: live-config-systemd
Architecture: all
Depends: ${misc:Depends}
@@ -37,7 +49,7 @@ Description: Debian Live - System Configuration Scripts (systemd backend)
Package: live-config-sysvinit
Architecture: all
-Depends: ${misc:Depends}, sysvinit (>= 2.86) | runit-run
+Depends: ${misc:Depends}, sysvinit (>= 2.86)
Conflicts: live-config-backend
Replaces: live-config-backend
Provides: live-config-backend
diff --git a/debian/live-config-sysvinit.live-config.init b/debian/live-config-runit.live-config.init
similarity index 92%
copy from debian/live-config-sysvinit.live-config.init
copy to debian/live-config-runit.live-config.init
index 00f5d20..c4bb034 100644
--- a/debian/live-config-sysvinit.live-config.init
+++ b/debian/live-config-runit.live-config.init
@@ -3,7 +3,7 @@
# live-config contains the scripts that configure a Debian Live system during
# the boot process (late userspace).
#
-# This is the sysvinit script for live-config.
+# This is the runit-run script for live-config.
### BEGIN INIT INFO
diff --git a/debian/rules b/debian/rules
index 98e032a..5327210 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,5 +24,6 @@ override_dh_auto_install:
mv debian/live-config/lib/live/config/*-sysv-rc debian/live-config-sysvinit/lib/live/config
override_dh_installinit:
- dh_installinit -p live-config-upstart --no-restart-on-upgrade --no-start --name live-config
+ dh_installinit -p live-config-runit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config
dh_installinit -p live-config-sysvinit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config
+ dh_installinit -p live-config-upstart --no-restart-on-upgrade --no-start --name live-config
--
live-config
More information about the debian-live-changes
mailing list