pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 126920 from Base:System

Browse Source 
- Do not ship plymouth units, they are shipped by plymouth package
  now (bnc#769397).
- Fix module loading (bnc#769462)

OBS-URL: https://build.opensuse.org/request/show/126920
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=102
This commit is contained in:
Stephan Kulow 2012-07-03 12:13:12 +00:00 committed by Git OBS Bridge
parent 3d49faeb93
commit df735c7bb5
4 changed files with 17 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
correct_plymouth_paths_and_conflicts.patch
View File

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

15
modules_on_boot.patch
View File

@ -7,10 +7,10 @@ Subject: [PATCH] module-load: handle SUSE /etc/sysconfig/kernel module list
src/modules-load.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/modules-load.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-) 1 files changed, 42 insertions(+), 0 deletions(-)
Index: systemd-41/src/modules-load.c Index: systemd-44/src/modules-load.c
=================================================================== ===================================================================
--- systemd-41.orig/src/modules-load.c --- systemd-44.orig/src/modules-load.c
+++ systemd-41/src/modules-load.c +++ systemd-44/src/modules-load.c
@@ -44,6 +44,9 @@ static void systemd_kmod_log(void *data, @@ -44,6 +44,9 @@ static void systemd_kmod_log(void *data,
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int r = EXIT_FAILURE; int r = EXIT_FAILURE;
@ -21,7 +21,7 @@ Index: systemd-41/src/modules-load.c
struct kmod_ctx *ctx; struct kmod_ctx *ctx;
const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED; const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED;
@@ -141,9 +144,58 @@ int main(int argc, char *argv[]) { @@ -141,9 +144,59 @@ int main(int argc, char *argv[]) {
fclose(f); fclose(f);
} }
@ -67,6 +67,7 @@ Index: systemd-41/src/modules-load.c
+ } + }
+ kmod_module_unref_list(modlist); + kmod_module_unref_list(modlist);
+ modlist = NULL;
+ } + }
+ } + }
+ strv_free(modules); + strv_free(modules);
@ -80,10 +81,10 @@ Index: systemd-41/src/modules-load.c
kmod_unref(ctx); kmod_unref(ctx);
return r; return r;
Index: systemd-41/units/systemd-modules-load.service.in Index: systemd-44/units/systemd-modules-load.service.in
=================================================================== ===================================================================
--- systemd-41.orig/units/systemd-modules-load.service.in --- systemd-44.orig/units/systemd-modules-load.service.in
+++ systemd-41/units/systemd-modules-load.service.in +++ systemd-44/units/systemd-modules-load.service.in
@@ -11,6 +11,7 @@ DefaultDependencies=no @@ -11,6 +11,7 @@ DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service After=systemd-readahead-collect.service systemd-readahead-replay.service

7
systemd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 2 15:44:28 UTC 2012 - fcrozat@suse.com
- Do not ship plymouth units, they are shipped by plymouth package
now (bnc#769397).
- Fix module loading (bnc#769462)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 7 13:14:40 UTC 2012 - fcrozat@suse.com Thu Jun 7 13:14:40 UTC 2012 - fcrozat@suse.com

23
systemd.spec
View File

@ -82,7 +82,6 @@ Patch31: lock-opensuse.patch
Patch33: crypt-loop-file.patch Patch33: crypt-loop-file.patch
Patch36: sysctl-modules.patch Patch36: sysctl-modules.patch
Patch38: dm-lvm-after-local-fs-pre-target.patch Patch38: dm-lvm-after-local-fs-pre-target.patch
Patch39: correct_plymouth_paths_and_conflicts.patch
Patch41: 0001-add-sparse-support-to-detect-endianness-bug.patch Patch41: 0001-add-sparse-support-to-detect-endianness-bug.patch
# Upstream First - Policy: # Upstream First - Policy:
@ -125,15 +124,6 @@ Provides: sysvinit:/sbin/init
%description sysvinit %description sysvinit
Drop-in replacement of System V init tools. Drop-in replacement of System V init tools.
%package plymouth
Summary: Plymouth support for systemd
Group: System/Base
Requires: %{name} = %{version}
Requires: plymouth
%description plymouth
Plymouth integration for systemd
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
@ -152,7 +142,6 @@ Plymouth integration for systemd
%patch33 -p1 %patch33 -p1
%patch36 -p1 %patch36 -p1
%patch38 -p1 %patch38 -p1
%patch39 -p1
%patch40 -p1 %patch40 -p1
%patch41 -p1 %patch41 -p1
%patch42 -p1 %patch42 -p1
@ -166,6 +155,7 @@ autoreconf -fiv
find . -name "*.[1-8]" -exec touch '{}' \; find . -name "*.[1-8]" -exec touch '{}' \;
touch src/systemadm.c touch src/systemadm.c
export V=1 export V=1
# disable plymouth at configure time, units are shipped in plymouth package now
%configure \ %configure \
--with-distro=suse \ --with-distro=suse \
--docdir=%{_docdir}/systemd \ --docdir=%{_docdir}/systemd \
@ -173,6 +163,7 @@ export V=1
--with-pamlibdir=/%{_lib}/security \ --with-pamlibdir=/%{_lib}/security \
--enable-split-usr \ --enable-split-usr \
--disable-gtk \ --disable-gtk \
--disable-plymouth \
CFLAGS="%{optflags}" CFLAGS="%{optflags}"
make %{?_smp_mflags} make %{?_smp_mflags}
@ -350,10 +341,6 @@ rm -rf %{buildroot}
%{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
%{_datadir}/systemd %{_datadir}/systemd
# Packaged in plymouth subpackage
%exclude /lib/systemd/system/plymouth-*.service
%exclude /lib/systemd/system/*.wants/plymouth-*.service
%exclude /lib/systemd/system/systemd-ask-password-plymouth.*
# Packaged in gtk subpackage # Packaged in gtk subpackage
%exclude %{_mandir}/man1/systemadm.1* %exclude %{_mandir}/man1/systemadm.1*
# Packaged in sysvinit subpackage # Packaged in sysvinit subpackage
@ -404,12 +391,6 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libsystemd-id128.pc %{_libdir}/pkgconfig/libsystemd-id128.pc
%{_libdir}/pkgconfig/libsystemd-journal.pc %{_libdir}/pkgconfig/libsystemd-journal.pc
%files plymouth
%defattr(-,root,root,-)
/lib/systemd/system/plymouth-*.service
/lib/systemd/system/*.wants/plymouth-*.service
/lib/systemd/system/systemd-ask-password-plymouth.*
%files sysvinit %files sysvinit
%defattr(-,root,root,-) %defattr(-,root,root,-)
/sbin/init /sbin/init