From fd56f1593b7b6aa03bdbbebcc9ea61207bcae52e9d566bd4e47b42bdccc9d1f4 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 2 Jul 2012 15:48:09 +0000 Subject: [PATCH] - Fix module loading (bnc#769462) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=282 --- modules_on_boot.patch | 15 ++++++++------- systemd.changes | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules_on_boot.patch b/modules_on_boot.patch index 739c2f92..f1b6fdb4 100644 --- a/modules_on_boot.patch +++ b/modules_on_boot.patch @@ -7,10 +7,10 @@ Subject: [PATCH] module-load: handle SUSE /etc/sysconfig/kernel module list src/modules-load.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 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-41/src/modules-load.c +--- systemd-44.orig/src/modules-load.c ++++ systemd-44/src/modules-load.c @@ -44,6 +44,9 @@ static void systemd_kmod_log(void *data, int main(int argc, char *argv[]) { int r = EXIT_FAILURE; @@ -21,7 +21,7 @@ Index: systemd-41/src/modules-load.c struct kmod_ctx *ctx; 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); } @@ -67,6 +67,7 @@ Index: systemd-41/src/modules-load.c + } + kmod_module_unref_list(modlist); ++ modlist = NULL; + } + } + strv_free(modules); @@ -80,10 +81,10 @@ Index: systemd-41/src/modules-load.c kmod_unref(ctx); 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-41/units/systemd-modules-load.service.in +--- systemd-44.orig/units/systemd-modules-load.service.in ++++ systemd-44/units/systemd-modules-load.service.in @@ -11,6 +11,7 @@ DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service diff --git a/systemd.changes b/systemd.changes index 7402525d..a6f9884b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -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 now (bnc#769397). +- Fix module loading (bnc#769462) ------------------------------------------------------------------- Thu Jun 7 13:14:40 UTC 2012 - fcrozat@suse.com