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

- Fix module loading (bnc#769462)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=282
This commit is contained in:
Frederic Crozat 2012-07-02 15:48:09 +00:00 committed by Git OBS Bridge
parent 8d6ce0d7c4
commit c02568bee6
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

3
systemd.changes
View File

@ -1,8 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 2 11:32:23 UTC 2012 - fcrozat@suse.com Mon Jul 2 15:44:28 UTC 2012 - fcrozat@suse.com
- Do not ship plymouth units, they are shipped by plymouth package - Do not ship plymouth units, they are shipped by plymouth package
now (bnc#769397). 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