chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e34eee2
)
main: honour rd.systemd.unit= only in the initrd, not the host
author
Lennart Poettering
<lennart@poettering.net>
Thu, 19 Jun 2014 14:14:56 +0000
(16:14 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 19 Jun 2014 14:33:01 +0000
(16:33 +0200)
src/core/main.c
patch
|
blob
|
history
diff --git
a/src/core/main.c
b/src/core/main.c
index c4dfe8cca69e5af9af287f134465b8b9f8b2a49d..b3ee1b9b889960589c7730cccb8687a88e1609d6 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-286,7
+286,8
@@
static int parse_proc_cmdline_item(const char *key, const char *value) {
} else if (streq(key, "rd.systemd.unit") && value) {
- return set_default_unit(value);
+ if (in_initrd())
+ return set_default_unit(value);
} else if (streq(key, "systemd.log_target") && value) {