if (arg_wall) {
char *p;
- if (!(p = strv_join(arg_wall, " "))) {
+ p = strv_join(arg_wall, " ");
+ if (!p) {
log_error("Failed to join strings.");
return;
}
return ret;
}
-/* ask systemd-logind, which might grant access to unprivileged users through polkit */
+/* Ask systemd-logind, which might grant access to unprivileged users
+ * through PolicyKit */
static int reboot_with_logind(DBusConnection *bus, enum action a) {
#ifdef HAVE_LOGIND
const char *method;
a = verb_to_action(args[0]);
- if (arg_force >= 2 && a == ACTION_HALT)
- halt_now(ACTION_HALT);
-
- if (arg_force >= 2 && a == ACTION_POWEROFF)
- halt_now(ACTION_POWEROFF);
-
- if (arg_force >= 2 && a == ACTION_REBOOT)
- halt_now(ACTION_REBOOT);
+ if (arg_force >= 2 &&
+ (a == ACTION_HALT ||
+ a == ACTION_POWEROFF ||
+ a == ACTION_REBOOT))
+ halt_now(a);
- if (arg_force &&
+ if (arg_force >= 1 &&
(a == ACTION_HALT ||
a == ACTION_POWEROFF ||
a == ACTION_REBOOT ||
a == ACTION_EXIT))
return daemon_reload(bus, args);
- if (geteuid() != 0) {
- /* first try logind, to allow authentication with polkit */
- if (a == ACTION_POWEROFF ||
- a == ACTION_REBOOT) {
- r = reboot_with_logind(bus, a);
- if (r >= 0)
- return r;
- }
+ /* first try logind, to allow authentication with polkit */
+ if (geteuid() != 0 &&
+ (a == ACTION_POWEROFF ||
+ a == ACTION_REBOOT)) {
+ r = reboot_with_logind(bus, a);
+ if (r >= 0)
+ return r;
}
r = start_unit(bus, args);
if (i->id && arg_transport != TRANSPORT_SSH) {
printf("\n");
- show_journal_by_unit(i->id, arg_output, NULL, 0, i->inactive_exit_timestamp_monotonic, arg_lines, arg_all, arg_follow);
+ show_journal_by_unit(i->id, arg_output, 0, i->inactive_exit_timestamp_monotonic, arg_lines, arg_all, arg_follow);
}
if (i->need_daemon_reload)
ARG_NO_ASK_PASSWORD,
ARG_FAILED,
ARG_RUNTIME,
- ARG_FOLLOW
+ ARG_FOLLOW,
+ ARG_FORCE
};
static const struct option options[] = {
{ "order", no_argument, NULL, ARG_ORDER },
{ "require", no_argument, NULL, ARG_REQUIRE },
{ "root", required_argument, NULL, ARG_ROOT },
- { "force", no_argument, NULL, 'f' },
+ { "force", no_argument, NULL, ARG_FORCE },
{ "no-reload", no_argument, NULL, ARG_NO_RELOAD },
{ "kill-mode", required_argument, NULL, ARG_KILL_MODE }, /* undocumented on purpose */
{ "kill-who", required_argument, NULL, ARG_KILL_WHO },
arg_quiet = true;
break;
+ case ARG_FORCE:
+ arg_force ++;
+ break;
+
+ case ARG_FOLLOW:
+ arg_follow = true;
+ break;
+
case 'f':
+ /* -f is short for both --follow and --force! */
arg_force ++;
+ arg_follow = true;
break;
case ARG_NO_RELOAD:
}
break;
- case ARG_FOLLOW:
- arg_follow = true;
- break;
-
case 'o':
arg_output = output_mode_from_string(optarg);
if (arg_output < 0) {
}
if (argc > optind) {
- if ((r = parse_time_spec(argv[optind], &arg_when)) < 0) {
+ r = parse_time_spec(argv[optind], &arg_when);
+ if (r < 0) {
log_error("Failed to parse time specification: %s", argv[optind]);
return r;
}
int r;
if (geteuid() != 0) {
- if (arg_action == ACTION_POWEROFF ||
- arg_action == ACTION_REBOOT) {
+ /* Try logind if we are a normal user and no special
+ * mode applies. Maybe PolicyKit allows us to shutdown
+ * the machine. */
+
+ if (arg_when <= 0 &&
+ !arg_dry &&
+ !arg_immediate &&
+ (arg_action == ACTION_POWEROFF ||
+ arg_action == ACTION_REBOOT)) {
r = reboot_with_logind(bus, arg_action);
if (r >= 0)
return r;
if (arg_when > 0) {
char *m;
- char date[FORMAT_TIMESTAMP_MAX];
m = strv_join(arg_wall, " ");
r = send_shutdownd(arg_when,
if (r < 0)
log_warning("Failed to talk to shutdownd, proceeding with immediate shutdown: %s", strerror(-r));
else {
+ char date[FORMAT_TIMESTAMP_MAX];
+
log_info("Shutdown scheduled for %s, use 'shutdown -c' to cancel.",
format_timestamp(date, sizeof(date), arg_when));
return 0;
if (!arg_no_wtmp) {
if (sd_booted() > 0)
log_debug("Not writing utmp record, assuming that systemd-update-utmp is used.");
- else if ((r = utmp_put_shutdown()) < 0)
- log_warning("Failed to write utmp record: %s", strerror(-r));
+ else {
+ r = utmp_put_shutdown();
+ if (r < 0)
+ log_warning("Failed to write utmp record: %s", strerror(-r));
+ }
}
if (!arg_no_sync)