Package: plymouth
Version: 0.8.8-11
Severity: normal
Tags: patch

On a systemd system, systemd tries to use both the native system plymouth
services and the sysv init scripts. This can be fixed by making the systemd
ones aliases of the sysv init scripts such that systemd recognizes they're a
replacement.

Attached debdiff does just that :)


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.10-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages plymouth depends on:
ii  initramfs-tools    0.113
ii  libc6              2.17-92
ii  multiarch-support  2.17-92

plymouth recommends no packages.

Versions of packages plymouth suggests:
ii  desktop-base  7.0.3
ii  plymouth-drm  0.8.8-11

-- no debconf information
diff -Nru plymouth-0.8.8/debian/changelog plymouth-0.8.8/debian/changelog
--- plymouth-0.8.8/debian/changelog	2013-07-17 21:36:40.000000000 +0200
+++ plymouth-0.8.8/debian/changelog	2013-08-08 16:01:25.000000000 +0200
@@ -1,3 +1,12 @@
+plymouth (0.8.8-11.1) experimental; urgency=low
+
+  * debian/patches/0009-init-script-aliases.patch
+    + Added. Add aliases to the systemd service so they mask the LSB init
+    scripts
+  * Use dh-systemd
+
+ -- Sjoerd Simons <sjo...@debian.org>  Tue, 06 Aug 2013 15:14:30 +0200
+
 plymouth (0.8.8-11) experimental; urgency=low
 
   * Adding vcs fields.
diff -Nru plymouth-0.8.8/debian/control plymouth-0.8.8/debian/control
--- plymouth-0.8.8/debian/control	2013-07-17 21:30:06.000000000 +0200
+++ plymouth-0.8.8/debian/control	2013-08-06 14:31:34.000000000 +0200
@@ -10,6 +10,7 @@
  libpango1.0-dev,
  libpng-dev,
  pkg-config,
+ dh-systemd (>= 1.5)
 Standards-Version: 3.9.4
 Homepage: http://www.freedesktop.org/wiki/Software/Plymouth
 Vcs-Browser: http://daniel-baumann.ch/gitweb/?p=debian/plymouth.git
diff -Nru plymouth-0.8.8/debian/patches/0009-init-script-aliases.patch plymouth-0.8.8/debian/patches/0009-init-script-aliases.patch
--- plymouth-0.8.8/debian/patches/0009-init-script-aliases.patch	1970-01-01 01:00:00.000000000 +0100
+++ plymouth-0.8.8/debian/patches/0009-init-script-aliases.patch	2013-08-06 15:14:29.000000000 +0200
@@ -0,0 +1,18 @@
+--- a/systemd-units/plymouth-quit.service.in
++++ b/systemd-units/plymouth-quit.service.in
+@@ -6,3 +6,6 @@
+ ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
+ Type=oneshot
+ TimeoutSec=20
++
++[Install]
++Alias=plymouth.service
+--- a/systemd-units/plymouth-read-write.service.in
++++ b/systemd-units/plymouth-read-write.service.in
+@@ -8,3 +8,6 @@
+ [Service]
+ ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth update-root-fs --read-write
+ Type=oneshot
++
++[Install]
++Alias=plymouth-log.service
diff -Nru plymouth-0.8.8/debian/patches/series plymouth-0.8.8/debian/patches/series
--- plymouth-0.8.8/debian/patches/series	2013-07-17 21:26:24.000000000 +0200
+++ plymouth-0.8.8/debian/patches/series	2013-08-06 15:13:49.000000000 +0200
@@ -6,3 +6,4 @@
 0006-udevadm.patch
 0007-deactivate.patch
 0008-config-parser.patch
+0009-init-script-aliases.patch
diff -Nru plymouth-0.8.8/debian/rules plymouth-0.8.8/debian/rules
--- plymouth-0.8.8/debian/rules	2013-06-11 17:38:46.000000000 +0200
+++ plymouth-0.8.8/debian/rules	2013-08-07 10:40:13.000000000 +0200
@@ -3,7 +3,7 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh ${@}
+	dh ${@} --with systemd
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -55,6 +55,9 @@
 	install -D -m 0755 debian/local/plymouth-update-initrd debian/plymouth/usr/lib/$(DEB_HOST_MULTIARCH)/plymouth/plymouth-update-initrd
 	install -D -m 0644 debian/local/plymouth.lsb debian/plymouth/lib/lsb/init-functions.d/99-plymouth
 
+override_dh_systemd_start:
+	dh_systemd_start --no-start
+
 override_dh_installinit:
 	dh_installinit --no-start -- start . 2 3 4 5 . stop . 0 6 .
 	dh_installinit --no-start --name=plymouth-log -- start . S .

Reply via email to