Merge branch 'plymouth-bump' into 'master'

Add plymouth

See merge request bgstack15/stackrpms!87

7 files changed, 180 insertions, 0 deletions

diff --git a/plymouth/debian/patches/0001-awk.patch b/plymouth/debian/patches/0001-awk.patch
new file mode 100644
index 0000000..5d62d95
--- /dev/null
+++ b/plymouth/debian/patches/0001-awk.patch
@@ -0,0 +1,22 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Hack to fix awk call.
+
+--- a/scripts/plymouth-set-default-theme.in
++++ b/scripts/plymouth-set-default-theme.in
+@@ -45,15 +45,7 @@ function list_themes ()
+ function read_theme_name_from_file ()
+ {
+         echo $(grep -v '^#' $1 2> /dev/null |
+-               awk '
+-                     BEGIN {
+-                        RS="[[][[:blank:]]*[^[:space:]]+[:blank:]*[]\n]";
+-                        FS="[=[:space:]]+";
+-                        OFS="";
+-                        ORS=""
+-                     }
+-                     $1 ~/Theme/ { print $2 }
+-               ')
++		awk -F= '/Theme=/ { print $2 }')
+ }
+ 
+ function get_default_theme ()
diff --git a/plymouth/debian/patches/0003-default-theme.patch b/plymouth/debian/patches/0003-default-theme.patch
new file mode 100644
index 0000000..c1f0542
--- /dev/null
+++ b/plymouth/debian/patches/0003-default-theme.patch
@@ -0,0 +1,20 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Ship configuration file with default theme set (Closes: #594999).
+
+--- a/src/plymouthd.conf
++++ b/src/plymouthd.conf
+@@ -1,3 +1,3 @@
+ # Administrator customizations go in this file
+ #[Daemon]
+-#Theme=fade-in
++#Theme=futureprototype
+--- a/src/plymouthd.defaults
++++ b/src/plymouthd.defaults
+@@ -1,6 +1,6 @@
+ # Distribution defaults. Changes to this file will get overwritten during
+ # upgrades.
+ [Daemon]
+-Theme=spinner
++Theme=futureprototype
+ ShowDelay=5
+ DeviceTimeout=5
diff --git a/plymouth/debian/patches/0004-return-code.patch b/plymouth/debian/patches/0004-return-code.patch
new file mode 100644
index 0000000..3623745
--- /dev/null
+++ b/plymouth/debian/patches/0004-return-code.patch
@@ -0,0 +1,14 @@
+Author: Michael Prokop <mika@debian.org>
+Description: Fixing wrong return code of plymouth-set-default-theme (Closes: #605018).
+
+--- a/scripts/plymouth-set-default-theme.in
++++ b/scripts/plymouth-set-default-theme.in
+@@ -184,5 +184,7 @@ grep -q '^[[]Daemon[]]' ${PLYMOUTH_CONFD
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ 
+-[ $DO_INITRD_REBUILD -ne 0 ] && (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd)
++if [ $DO_INITRD_REBUILD -ne 0 ] ; then
++        (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd)
++fi
+ exit 0
diff --git a/plymouth/debian/patches/0005-cmdline.patch b/plymouth/debian/patches/0005-cmdline.patch
new file mode 100644
index 0000000..7d63c55
--- /dev/null
+++ b/plymouth/debian/patches/0005-cmdline.patch
@@ -0,0 +1,80 @@
+Author: Laurent Bigonville <bigon@debian.org
+Description:
+ Handle 'nosplash' boot parameter as 'plymouth.enable=0' in system unit
+
+--- a/systemd-units/plymouth-halt.service.in
++++ b/systemd-units/plymouth-halt.service.in
+@@ -4,7 +4,8 @@ After=getty@tty1.service display-manager
+ Before=systemd-halt.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
+ ConditionVirtualization=!container
+ 
+ [Service]
+ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+--- a/systemd-units/plymouth-kexec.service.in
++++ b/systemd-units/plymouth-kexec.service.in
+@@ -4,7 +4,8 @@ After=getty@tty1.service display-manager
+ Before=systemd-kexec.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
+ ConditionVirtualization=!container
+ 
+ [Service]
+ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+--- a/systemd-units/plymouth-poweroff.service.in
++++ b/systemd-units/plymouth-poweroff.service.in
+@@ -4,7 +4,8 @@ After=getty@tty1.service display-manager
+ Before=systemd-poweroff.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
+ ConditionVirtualization=!container
+ 
+ [Service]
+ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+--- a/systemd-units/plymouth-reboot.service.in
++++ b/systemd-units/plymouth-reboot.service.in
+@@ -4,7 +4,8 @@ After=getty@tty1.service display-manager
+ Before=systemd-reboot.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
+ ConditionVirtualization=!container
+ 
+ [Service]
+ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+--- a/systemd-units/plymouth-start.service.in
++++ b/systemd-units/plymouth-start.service.in
+@@ -5,7 +5,8 @@ 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=!nosplash
+ ConditionVirtualization=!container
+ 
+ [Service]
+ ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
+--- 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=!nosplash
+ ConditionPathExists=/run/plymouth/pid
+ 
+ [Path]
+--- a/systemd-units/systemd-ask-password-plymouth.service.in
++++ b/systemd-units/systemd-ask-password-plymouth.service.in
+@@ -6,7 +6,8 @@ Conflicts=shutdown.target
+ After=plymouth-start.service
+ Before=shutdown.target
+ ConditionKernelCommandLine=!plymouth.enable=0
++ConditionKernelCommandLine=!nosplash
+ ConditionVirtualization=!container
+ ConditionPathExists=/run/plymouth/pid
+ 
+ [Service]
diff --git a/plymouth/debian/patches/0008-show-delay.patch b/plymouth/debian/patches/0008-show-delay.patch
new file mode 100644
index 0000000..3b9105e
--- /dev/null
+++ b/plymouth/debian/patches/0008-show-delay.patch
@@ -0,0 +1,19 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Setting no delay for fast booting machines (Closes: #752746).
+
+--- a/src/plymouthd.conf
++++ b/src/plymouthd.conf
+@@ -1,3 +1,4 @@
+ # Administrator customizations go in this file
+ #[Daemon]
+ #Theme=futureprototype
++#ShowDelay=0
+--- a/src/plymouthd.defaults
++++ b/src/plymouthd.defaults
+@@ -2,5 +2,5 @@
+ # upgrades.
+ [Daemon]
+ Theme=futureprototype
+-ShowDelay=5
++ShowDelay=0
+ DeviceTimeout=5
diff --git a/plymouth/debian/patches/drop-systemd-vconsole-setup-service.patch b/plymouth/debian/patches/drop-systemd-vconsole-setup-service.patch
new file mode 100644
index 0000000..33739e2
--- /dev/null
+++ b/plymouth/debian/patches/drop-systemd-vconsole-setup-service.patch
@@ -0,0 +1,19 @@
+Description: Remove systemd-vconsole-setup.service as it's not shipped in Debian
+ Remove systemd-vconsole-setup.service as it's not shipped in Debian and add
+ After=keyboard-setup.service
+Author: Laurent Bigonville <bigon@debian.org>
+Forwarded: not-needed
+
+--- a/systemd-units/plymouth-start.service.in
++++ b/systemd-units/plymouth-start.service.in
+@@ -1,8 +1,8 @@
+ [Unit]
+ Description=Show Plymouth Boot Screen
+ DefaultDependencies=no
+-Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service
+-After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
++Wants=systemd-ask-password-plymouth.path
++After=systemd-udev-trigger.service systemd-udevd.service keyboard-setup.service
+ Before=systemd-ask-password-plymouth.service
+ ConditionKernelCommandLine=!plymouth.enable=0
+ ConditionKernelCommandLine=!nosplash
diff --git a/plymouth/debian/patches/series b/plymouth/debian/patches/series
new file mode 100644
index 0000000..fc1873e
--- /dev/null
+++ b/plymouth/debian/patches/series
@@ -0,0 +1,6 @@
+0001-awk.patch
+0003-default-theme.patch
+0004-return-code.patch
+0005-cmdline.patch
+0008-show-delay.patch
+drop-systemd-vconsole-setup-service.patch