chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: unify reading of /proc/cmdline
[elogind.git]
/
src
/
udev
/
net
/
link-config.c
diff --git
a/src/udev/net/link-config.c
b/src/udev/net/link-config.c
index 9d0f23694c3d2039cb075f9f28294849dab2ecb3..726945816dc79580da31dfd04a3ea2a43eaec469 100644
(file)
--- a/
src/udev/net/link-config.c
+++ b/
src/udev/net/link-config.c
@@
-195,11
+195,11
@@
static bool enable_name_policy(void) {
int r;
size_t l;
int r;
size_t l;
- r =
read_one_line_file("/proc/cmdline",
&line);
- if (r < 0)
{
+ r =
proc_cmdline(
&line);
+ if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- return true; /* something is very wrong, let's not make it worse */
- }
+ if (r <= 0)
+ return true;
FOREACH_WORD_QUOTED(w, l, line, state)
if (strneq(w, "net.ifnames=0", l))
FOREACH_WORD_QUOTED(w, l, line, state)
if (strneq(w, "net.ifnames=0", l))