rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 106382 from home:tittiatcoke

Browse Source 
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
This commit is contained in:
Frederic Crozat 2012-02-22 11:37:23 +00:00 committed by Git OBS Bridge
parent e6f30ccfa0
commit c9ee05798f
2 changed files with 92 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
correct_plymouth_paths_and_conflicts.patch Normal file
View File

@ -0,0 +1,90 @@
--- 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

4
systemd.spec
View File

@ -80,6 +80,7 @@ Patch31: lock-opensuse.patch
Patch33: crypt-loop-file.patch
Patch36: sysctl-modules.patch
Patch38: dm-lvm-after-local-fs-pre-target.patch
Patch39: correct_plymouth_paths_and_conflicts.patch
# Upstream First - Policy:
# Never add any patches to this package without the upstream commit id
@ -144,6 +145,7 @@ Plymouth integration for systemd
%patch33 -p1
%patch36 -p1
%patch38 -p1
%patch39 -p1
%build
autoreconf -fiv
@ -186,8 +188,6 @@ ln -s ../bin/systemctl %{buildroot}/sbin/telinit
ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
rm -rf %{buildroot}/etc/systemd/system/*.target.wants
rm -f %{buildroot}/etc/systemd/system/default.target
# Don't activate the plymouth-quit services in order to get a smooth transistion to the DM
rm -f %{buildroot}/lib/systemd/system/*.wants/plymouth-quit*.service
# aliases for /etc/init.d/*
ln -s /dev/null %{buildroot}/lib/systemd/system/cgroup.service
ln -s systemd-tmpfiles-setup.service %{buildroot}/lib/systemd/system/cleanup.service