From 53f6858b5642d5ebb17c96b228924ad141ac477376caa7aef27be110b21d792c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 18 May 2015 14:47:17 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=869 --- 1021-udev-re-add-persistent-net-rules.patch | 4 ++-- systemd-mini.changes | 7 +++++++ systemd.changes | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/1021-udev-re-add-persistent-net-rules.patch b/1021-udev-re-add-persistent-net-rules.patch index 5d21f1fe..145955d4 100644 --- a/1021-udev-re-add-persistent-net-rules.patch +++ b/1021-udev-re-add-persistent-net-rules.patch @@ -41,7 +41,7 @@ Index: systemd-218/src/udev/net/link-config.c log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m"); +#if defined(NET_IFNAMES) && (NET_IFNAMES == 1) +# warning Using persistent rules as a default -+ if (r <= 0) ++ if (r < 0) + return false; + + FOREACH_WORD_QUOTED(w, l, line, state) @@ -51,7 +51,7 @@ Index: systemd-218/src/udev/net/link-config.c + return false; +#else +# warning Using predictable rules as a default -+ if (r <= 0) ++ if (r < 0) return true; - } diff --git a/systemd-mini.changes b/systemd-mini.changes index 3c1a26a7..39f4d11c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 18 14:39:47 UTC 2015 - werner@suse.de + +- Modify patch 1021-udev-re-add-persistent-net-rules.patch to use + the new return values of proc_cmdline() in enable_name_policy() + this should fix boo#931165 + ------------------------------------------------------------------- Mon Mar 16 15:35:31 UTC 2015 - werner@suse.de diff --git a/systemd.changes b/systemd.changes index 3c1a26a7..39f4d11c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 18 14:39:47 UTC 2015 - werner@suse.de + +- Modify patch 1021-udev-re-add-persistent-net-rules.patch to use + the new return values of proc_cmdline() in enable_name_policy() + this should fix boo#931165 + ------------------------------------------------------------------- Mon Mar 16 15:35:31 UTC 2015 - werner@suse.de