forked from pool/systemd
Frederic Crozat
c9ee05798f
Added a patch to correct the path to the plymouth binaries (changed to /usr/...) and also to make the two plymouth-quit*.services conflicting with the graphical.target. This would quit plymouth when running in runlevel 3 (non-graphical), but leaves the killing of plymouth up to the displaymanager when running in the graphical target. OBS-URL: https://build.opensuse.org/request/show/106382 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=253
91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
--- systemd-43/units/plymouth-halt.service 2012-02-15 04:27:59.626029851 +0100
|
|
+++ new/units/plymouth-halt.service 2012-02-21 18:28:16.225983153 +0100
|
|
@@ -13,6 +13,6 @@
|
|
ConditionKernelCommandLine=!plymouth.enable=0
|
|
|
|
[Service]
|
|
-ExecStart=/sbin/plymouthd --mode=shutdown
|
|
-ExecStartPost=-/bin/plymouth --show-splash
|
|
+ExecStart=/usr/sbin/plymouthd --mode=shutdown
|
|
+ExecStartPost=-/usr/bin/plymouth --show-splash
|
|
Type=forking
|
|
--- systemd-43/units/plymouth-kexec.service 2012-02-15 04:27:59.452029843 +0100
|
|
+++ new/units/plymouth-kexec.service 2012-02-21 18:28:36.056981567 +0100
|
|
@@ -13,6 +13,6 @@
|
|
ConditionKernelCommandLine=!plymouth.enable=0
|
|
|
|
[Service]
|
|
-ExecStart=/sbin/plymouthd --mode=shutdown
|
|
-ExecStartPost=-/bin/plymouth --show-splash
|
|
+ExecStart=/usr/sbin/plymouthd --mode=shutdown
|
|
+ExecStartPost=-/usr/bin/plymouth --show-splash
|
|
Type=forking
|
|
--- systemd-43/units/plymouth-poweroff.service 2012-02-15 04:28:00.144029876 +0100
|
|
+++ new/units/plymouth-poweroff.service 2012-02-21 18:28:45.495981246 +0100
|
|
@@ -13,6 +13,6 @@
|
|
ConditionKernelCommandLine=!plymouth.enable=0
|
|
|
|
[Service]
|
|
-ExecStart=/sbin/plymouthd --mode=shutdown
|
|
-ExecStartPost=-/bin/plymouth --show-splash
|
|
+ExecStart=/usr/sbin/plymouthd --mode=shutdown
|
|
+ExecStartPost=-/usr/bin/plymouth --show-splash
|
|
Type=forking
|
|
--- systemd-43/units/plymouth-quit.service 2012-02-15 04:28:00.134029876 +0100
|
|
+++ new/units/plymouth-quit.service 2012-02-21 18:29:00.855980323 +0100
|
|
@@ -8,8 +8,9 @@
|
|
[Unit]
|
|
Description=Terminate Plymouth Boot Screen
|
|
After=rc-local.service plymouth-start.service
|
|
+Conflicts=graphical.target
|
|
|
|
[Service]
|
|
-ExecStart=-/bin/plymouth quit
|
|
+ExecStart=-/usr/bin/plymouth quit
|
|
Type=oneshot
|
|
TimeoutSec=20
|
|
--- systemd-43/units/plymouth-quit-wait.service 2012-02-15 04:27:59.894029864 +0100
|
|
+++ new/units/plymouth-quit-wait.service 2012-02-21 18:29:14.904979438 +0100
|
|
@@ -8,8 +8,9 @@
|
|
[Unit]
|
|
Description=Wait for Plymouth Boot Screen to Quit
|
|
After=rc-local.service plymouth-start.service
|
|
+Conflicts=graphical.target
|
|
|
|
[Service]
|
|
-ExecStart=-/bin/plymouth --wait
|
|
+ExecStart=-/usr/bin/plymouth --wait
|
|
Type=oneshot
|
|
TimeoutSec=20
|
|
--- systemd-43/units/plymouth-read-write.service 2012-02-15 04:27:59.457029843 +0100
|
|
+++ new/units/plymouth-read-write.service 2012-02-21 18:29:29.439978464 +0100
|
|
@@ -12,5 +12,5 @@
|
|
Before=sysinit.target
|
|
|
|
[Service]
|
|
-ExecStart=-/bin/plymouth update-root-fs --read-write
|
|
+ExecStart=-/usr/bin/plymouth update-root-fs --read-write
|
|
Type=oneshot
|
|
--- systemd-43/units/plymouth-reboot.service 2012-02-15 04:28:00.149029877 +0100
|
|
+++ new/units/plymouth-reboot.service 2012-02-21 18:29:43.718977613 +0100
|
|
@@ -13,6 +13,6 @@
|
|
ConditionKernelCommandLine=!plymouth.enable=0
|
|
|
|
[Service]
|
|
-ExecStart=/sbin/plymouthd --mode=shutdown
|
|
-ExecStartPost=-/bin/plymouth --show-splash
|
|
+ExecStart=/usr/sbin/plymouthd --mode=shutdown
|
|
+ExecStartPost=-/usr/bin/plymouth --show-splash
|
|
Type=forking
|
|
--- systemd-43/units/plymouth-start.service 2012-02-15 04:28:00.174029878 +0100
|
|
+++ new/units/plymouth-start.service 2012-02-21 18:30:01.994976517 +0100
|
|
@@ -17,6 +17,6 @@
|
|
ConditionKernelCommandLine=!plymouth.enable=0
|
|
|
|
[Service]
|
|
-ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
|
|
-ExecStartPost=-/bin/plymouth --show-splash
|
|
+ExecStart=/usr/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
|
|
+ExecStartPost=-/usr/bin/plymouth --show-splash
|
|
Type=forking
|