forked from pool/systemd
- 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
This commit is contained in:
parent
261c9f81a4
commit
8e1aa9ca86
@ -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);
|
||||
@ -31,7 +31,8 @@ Index: systemd-37/src/modules-load.c
|
||||
+ NULL)) < 0) {
|
||||
+ 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);
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user