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

- Update modules_on_boot.patch to not cause failed state for

Browse Source 
systemd-modules-load.service (bnc#741481).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=236
This commit is contained in:
Frederic Crozat 2012-01-26 16:29:45 +00:00 committed by Git OBS Bridge
parent 261c9f81a4
commit 8e1aa9ca86
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules_on_boot.patch
View File

@ -21,7 +21,7 @@ Index: systemd-37/src/modules-load.c
if (argc > 1) { if (argc > 1) {
log_error("This program takes no argument."); 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); strv_free(files);
@ -29,9 +29,10 @@ Index: systemd-37/src/modules-load.c
+ if ((r = parse_env_file("/etc/sysconfig/kernel", NEWLINE, + if ((r = parse_env_file("/etc/sysconfig/kernel", NEWLINE,
+ "MODULES_LOADED_ON_BOOT", &modules_on_boot, + "MODULES_LOADED_ON_BOOT", &modules_on_boot,
+ NULL)) < 0) { + NULL)) < 0) {
+ if (r != -ENOENT) + if (r != -ENOENT)
+ log_warning("Failed to read /etc/sysconfig/kernel: %s", strerror(-r)); + log_warning("Failed to read /etc/sysconfig/kernel: %s", strerror(-r));
+ } + } else
+ r = EXIT_SUCCESS;
+ if (modules_on_boot) { + if (modules_on_boot) {
+ char **modules = strv_split(modules_on_boot,WHITESPACE); + char **modules = strv_split(modules_on_boot,WHITESPACE);
+ char **module; + char **module;
@ -64,7 +65,7 @@ Index: systemd-37/src/modules-load.c
finish: finish:
if (n_arguments > 3) { if (n_arguments > 3) {
@@ -138,6 +177,9 @@ finish: @@ -138,6 +178,9 @@ finish:
} }
strv_free(arguments); strv_free(arguments);

6
systemd.changes
View File

@ -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 Wed Jan 25 10:37:06 UTC 2012 - fcrozat@suse.com