plymouth/plymoith-sd-notforking.patch
Raymond Wooninck cc6b3e5e91 Accepting request 141258 from home:seife:branches:Base:System
- fix path to systemd-tty-ask-password-agent for newer systemd
- create the pid file again during boot, the existence of this is
  a condition for systemd-ask-password-plymouth.service. A proper
  fix might look different but that get's it going again.

OBS-URL: https://build.opensuse.org/request/show/141258
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=93
2012-11-14 10:15:18 +00:00

63 lines
2.8 KiB
Diff

--- systemd-units/plymouth-halt.service.in.orig
+++ systemd-units/plymouth-halt.service.in
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
Before=halt.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-kexec.service.in.orig
+++ systemd-units/plymouth-kexec.service.in
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
Before=kexec.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-poweroff.service.in.orig
+++ systemd-units/plymouth-poweroff.service.in
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
Before=poweroff.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-reboot.service.in.orig
+++ systemd-units/plymouth-reboot.service.in
@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service
Before=reboot.service
DefaultDependencies=no
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-start.service.in.orig
+++ systemd-units/plymouth-start.service.in
@@ -5,10 +5,9 @@ Wants=systemd-ask-password-plymouth.path
After=systemd-vconsole-setup.service systemd-udev-trigger.service
Before=systemd-ask-password-plymouth.service
ConditionKernelCommandLine=!plymouth.enable=0
[Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --no-daemon --attach-to-session
ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
KillMode=none
SendSIGKILL=no