reassign 768329 plymouth 0.9.0-8
retitle 768329 plymouth: Please enable splash for jessie
tag 768329 + patch
thanks
Hello,
I'm reassigning this bug to plymouth.
I already looked at this and I have a proposed fix (see attached patch).
With this patch, we have now 3 situations when the package is installed:
- The package is installed and no extra boot parameter is passed to
the kernel: plymouth will display the details which displays the
usual boot messages.
- The package is installed and "splash" is passed to the kernel: A
fancy boot screen will be displayed to the user.
- The package is installed and "nosplash" (or "plymouth.enable=0") is
passed to the kernel: Everything is disabled like if the package was
not installed.
What do you think about this solution?
Cheers,
Laurent Bigonville
commit d54e54ceb8278bb0fb70328f027dedfe89374d0a
Author: Laurent Bigonville <bi...@bigon.be>
Date: Mon Nov 10 11:41:07 2014 +0100
Enable I/O multiplexing functionality of plymouth by default as soon as the main package is installed. (Closes: #768329)
diff --git a/debian/changelog b/debian/changelog
index 23a13bd..aad5e51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ plymouth (0.9.0-9) UNRELEASED; urgency=medium
* debian/local/plymouth.hook: Properly copy .plymouth file into the
initramfs for themes that are not shipping images, this should fix the
tribar theme.
+ * Enable I/O multiplexing functionality of plymouth by default as soon as
+ the main package is installed. (Closes: #768329)
- -- Laurent Bigonville <bi...@debian.org> Mon, 10 Nov 2014 12:48:27 +0100
+ -- Laurent Bigonville <bi...@debian.org> Mon, 10 Nov 2014 11:38:11 +0100
plymouth (0.9.0-8) unstable; urgency=medium
diff --git a/debian/local/plymouth.init-premount b/debian/local/plymouth.init-premount
index 6e1dfd3..e5a7db6 100644
--- a/debian/local/plymouth.init-premount
+++ b/debian/local/plymouth.init-premount
@@ -14,7 +14,7 @@ case ${1} in
;;
esac
-SPLASH="false"
+SPLASH="true"
for ARGUMENT in $(cat /proc/cmdline)
do
@@ -23,7 +23,7 @@ do
SPLASH="true"
;;
- nosplash*)
+ nosplash*|plymouth.enable=0)
SPLASH="false"
;;
esac
diff --git a/debian/patches/0005-cmdline.patch b/debian/patches/0005-cmdline.patch
index 4f19726..398ee3c 100644
--- a/debian/patches/0005-cmdline.patch
+++ b/debian/patches/0005-cmdline.patch
@@ -1,89 +1,74 @@
-Author: Daniel Baumann <m...@daniel-baumann.ch>
+Author: Laurent Bigonville <bi...@debian.org
Description:
- Using 'splash' as boot parameter instead of 'plymouth.enable' in system unit
- files (Closes: #680517).
+ Handle 'nosplash' boot parameter as 'plymouth.enable=0' in system unit
-diff -Naurp plymouth.orig/systemd-units/plymouth-halt.service.in plymouth/systemd-units/plymouth-halt.service.in
---- plymouth.orig/systemd-units/plymouth-halt.service.in
-+++ plymouth/systemd-units/plymouth-halt.service.in
-@@ -3,7 +3,7 @@ Description=Show Plymouth Halt Screen
- After=getty@tty1.service display-manager.service plymouth-start.service
+--- a/systemd-units/plymouth-halt.service.in
++++ b/systemd-units/plymouth-halt.service.in
+@@ -4,6 +4,7 @@ After=getty@tty1.service display-manager
Before=systemd-halt.service
DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
-+ConditionKernelCommandLine=splash
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
-diff -Naurp plymouth.orig/systemd-units/plymouth-kexec.service.in plymouth/systemd-units/plymouth-kexec.service.in
---- plymouth.orig/systemd-units/plymouth-kexec.service.in
-+++ plymouth/systemd-units/plymouth-kexec.service.in
-@@ -3,7 +3,7 @@ Description=Show Plymouth Reboot with ke
- After=getty@tty1.service display-manager.service plymouth-start.service
+--- a/systemd-units/plymouth-kexec.service.in
++++ b/systemd-units/plymouth-kexec.service.in
+@@ -4,6 +4,7 @@ After=getty@tty1.service display-manager
Before=systemd-kexec.service
DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
-+ConditionKernelCommandLine=splash
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
-diff -Naurp plymouth.orig/systemd-units/plymouth-poweroff.service.in plymouth/systemd-units/plymouth-poweroff.service.in
---- plymouth.orig/systemd-units/plymouth-poweroff.service.in
-+++ plymouth/systemd-units/plymouth-poweroff.service.in
-@@ -3,7 +3,7 @@ Description=Show Plymouth Power Off Scre
- After=getty@tty1.service display-manager.service plymouth-start.service
+--- a/systemd-units/plymouth-poweroff.service.in
++++ b/systemd-units/plymouth-poweroff.service.in
+@@ -4,6 +4,7 @@ After=getty@tty1.service display-manager
Before=systemd-poweroff.service
DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
-+ConditionKernelCommandLine=splash
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
-diff -Naurp plymouth.orig/systemd-units/plymouth-reboot.service.in plymouth/systemd-units/plymouth-reboot.service.in
---- plymouth.orig/systemd-units/plymouth-reboot.service.in
-+++ plymouth/systemd-units/plymouth-reboot.service.in
-@@ -3,7 +3,7 @@ Description=Show Plymouth Reboot Screen
- After=getty@tty1.service display-manager.service plymouth-start.service
+--- a/systemd-units/plymouth-reboot.service.in
++++ b/systemd-units/plymouth-reboot.service.in
+@@ -4,6 +4,7 @@ After=getty@tty1.service display-manager
Before=systemd-reboot.service
DefaultDependencies=no
--ConditionKernelCommandLine=!plymouth.enable=0
-+ConditionKernelCommandLine=splash
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
-diff -Naurp plymouth.orig/systemd-units/plymouth-start.service.in plymouth/systemd-units/plymouth-start.service.in
---- plymouth.orig/systemd-units/plymouth-start.service.in
-+++ plymouth/systemd-units/plymouth-start.service.in
-@@ -4,7 +4,7 @@ DefaultDependencies=no
- Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service
+--- a/systemd-units/plymouth-start.service.in
++++ b/systemd-units/plymouth-start.service.in
+@@ -5,6 +5,7 @@ Wants=systemd-ask-password-plymouth.path
After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
Before=systemd-ask-password-plymouth.service
--ConditionKernelCommandLine=!plymouth.enable=0
-+ConditionKernelCommandLine=splash
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
-diff -Naurp plymouth.orig/systemd-units/systemd-ask-password-plymouth.path.in plymouth/systemd-units/systemd-ask-password-plymouth.path.in
---- plymouth.orig/systemd-units/systemd-ask-password-plymouth.path.in 2012-09-26 18:50:53.000000000 +0200
-+++ plymouth/systemd-units/systemd-ask-password-plymouth.path.in
-@@ -5,7 +5,7 @@ DefaultDependencies=no
- Conflicts=shutdown.target
+--- a/systemd-units/systemd-ask-password-plymouth.path.in
++++ b/systemd-units/systemd-ask-password-plymouth.path.in
+@@ -6,6 +6,7 @@ Conflicts=shutdown.target
After=plymouth-start.service
Before=basic.target shutdown.target
--ConditionKernelCommandLine=!plymouth.enable=0
-+ConditionKernelCommandLine=splash
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
ConditionPathExists=/run/plymouth/pid
[Path]
-diff -Naurp plymouth.orig/systemd-units/systemd-ask-password-plymouth.service.in plymouth/systemd-units/systemd-ask-password-plymouth.service.in
---- plymouth.orig/systemd-units/systemd-ask-password-plymouth.service.in
-+++ plymouth/systemd-units/systemd-ask-password-plymouth.service.in
-@@ -5,7 +5,7 @@ DefaultDependencies=no
- Conflicts=shutdown.target
+--- a/systemd-units/systemd-ask-password-plymouth.service.in
++++ b/systemd-units/systemd-ask-password-plymouth.service.in
+@@ -6,6 +6,7 @@ Conflicts=shutdown.target
After=plymouth-start.service
Before=shutdown.target
--ConditionKernelCommandLine=!plymouth.enable=0
-+ConditionKernelCommandLine=splash
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
ConditionPathExists=/run/plymouth/pid
[Service]
diff --git a/debian/patches/drop-systemd-vconsole-setup-service.patch b/debian/patches/drop-systemd-vconsole-setup-service.patch
index 9c6c3a5..33739e2 100644
--- a/debian/patches/drop-systemd-vconsole-setup-service.patch
+++ b/debian/patches/drop-systemd-vconsole-setup-service.patch
@@ -15,5 +15,5 @@ Forwarded: not-needed
+Wants=systemd-ask-password-plymouth.path
+After=systemd-udev-trigger.service systemd-udevd.service keyboard-setup.service
Before=systemd-ask-password-plymouth.service
- ConditionKernelCommandLine=splash
-
+ ConditionKernelCommandLine=!plymouth.enable=0
+ ConditionKernelCommandLine=!nosplash
diff --git a/debian/plymouth.NEWS b/debian/plymouth.NEWS
new file mode 100644
index 0000000..bf1d515
--- /dev/null
+++ b/debian/plymouth.NEWS
@@ -0,0 +1,13 @@
+plymouth (0.9.0-9) UNRELEASED; urgency=medium
+
+ Starting with this version, installing the plymouth package will
+ automatically enable plymouth I/O multiplexing functionality. This is needed
+ if you are using an event-based init system. The bootup messages will still be
+ displayed as usual.
+
+ If you don't want this functionality, you could either uninstall the
+ plymouth package or pass "plymouth.enable=0" or "nosplash" to the kernel
+ cmdline. On the other hand if you want a fancy boot screen, you explicitly
+ need to pass "splash" to the kernel cmdline.
+
+ -- Laurent Bigonville <bi...@debian.org> Mon, 10 Nov 2014 11:23:37 +0100
diff --git a/debian/plymouth.init b/debian/plymouth.init
index a2eb17d..2658bcb 100644
--- a/debian/plymouth.init
+++ b/debian/plymouth.init
@@ -26,6 +26,7 @@ fi
set -e
+SPLASH="true"
for ARGUMENT in $(cat /proc/cmdline)
do
case "${ARGUMENT}" in
@@ -33,7 +34,7 @@ do
SPLASH="true"
;;
- nosplash*)
+ nosplash*|plymouth.enable=0)
SPLASH="false"
;;
esac
