From 5588a667caaebfd913c2f71d31846fe7ac8d235d42ff0de9e53eb9b82184c595 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Thu, 26 Jan 2012 16:29:45 +0000 Subject: [PATCH] - Update modules_on_boot.patch to not cause failed state for systemd-modules-load.service (bnc#741481). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=236 --- modules_on_boot.patch | 11 ++++++----- systemd.changes | 6 ++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules_on_boot.patch b/modules_on_boot.patch index 5158a716..9638b27c 100644 --- a/modules_on_boot.patch +++ b/modules_on_boot.patch @@ -21,7 +21,7 @@ Index: systemd-37/src/modules-load.c if (argc > 1) { log_error("This program takes no argument."); -@@ -126,6 +129,42 @@ int main(int argc, char *argv[]) { +@@ -126,6 +129,43 @@ int main(int argc, char *argv[]) { } strv_free(files); @@ -29,9 +29,10 @@ Index: systemd-37/src/modules-load.c + if ((r = parse_env_file("/etc/sysconfig/kernel", NEWLINE, + "MODULES_LOADED_ON_BOOT", &modules_on_boot, + NULL)) < 0) { -+ if (r != -ENOENT) -+ log_warning("Failed to read /etc/sysconfig/kernel: %s", strerror(-r)); -+ } ++ if (r != -ENOENT) ++ log_warning("Failed to read /etc/sysconfig/kernel: %s", strerror(-r)); ++ } else ++ r = EXIT_SUCCESS; + if (modules_on_boot) { + char **modules = strv_split(modules_on_boot,WHITESPACE); + char **module; @@ -64,7 +65,7 @@ Index: systemd-37/src/modules-load.c finish: if (n_arguments > 3) { -@@ -138,6 +177,9 @@ finish: +@@ -138,6 +178,9 @@ finish: } strv_free(arguments); diff --git a/systemd.changes b/systemd.changes index 32be4c38..a795f3dd 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 26 16:00:27 UTC 2012 - fcrozat@suse.com + +- Update modules_on_boot.patch to not cause failed state for + systemd-modules-load.service (bnc#741481). + ------------------------------------------------------------------- Wed Jan 25 10:37:06 UTC 2012 - fcrozat@suse.com