chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 176a4f5ecbbb4be8e9c6712ce32e657bbbf9a35d..b43d8eca918ffa9d94afdb5fa57fa430381aeb5f 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1093,11
+1093,6
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- /* If Plymouth is being run make sure we show the status, so
- * that there's something nice to see when people press Esc */
- if (access("/run/initramfs/plymouth", F_OK) >= 0)
- arg_show_status = true;
-
if (arg_action == ACTION_HELP) {
retval = help();
goto finish;
if (arg_action == ACTION_HELP) {
retval = help();
goto finish;
@@
-1177,7
+1172,7
@@
int main(int argc, char *argv[]) {
if (arg_running_as == MANAGER_SYSTEM && !serialization) {
locale_setup();
if (arg_running_as == MANAGER_SYSTEM && !serialization) {
locale_setup();
- if (arg_show_status)
+ if (arg_show_status
|| plymouth_running()
)
status_welcome();
kmod_setup();
status_welcome();
kmod_setup();