chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus_property_append_long: use signed long and 'x' in the signature for DBUS_TYPE_INT64
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 176a4f5ecbbb4be8e9c6712ce32e657bbbf9a35d..52b3031fbe30ebb080affb08636f425bd317e33c 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-203,7
+203,7
@@
static int console_setup(bool do_reset) {
return -tty_fd;
}
return -tty_fd;
}
- if ((r = reset_terminal(tty_fd)) < 0)
+ if ((r = reset_terminal
_fd
(tty_fd)) < 0)
log_error("Failed to reset /dev/console: %s", strerror(-r));
close_nointr_nofail(tty_fd);
log_error("Failed to reset /dev/console: %s", strerror(-r));
close_nointr_nofail(tty_fd);
@@
-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();