chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shutdown: respect the dry run option '-k'
[elogind.git]
/
src
/
systemctl.c
diff --git
a/src/systemctl.c
b/src/systemctl.c
index b584e7032b9558672b5424d854096ffdaf974a6e..8f904c16c2026bae68cb63c886ce8de173e2aea9 100644
(file)
--- a/
src/systemctl.c
+++ b/
src/systemctl.c
@@
-5422,7
+5422,7
@@
static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
return verbs[i].dispatch(bus, argv + optind, left);
}
return verbs[i].dispatch(bus, argv + optind, left);
}
-static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) {
+static int send_shutdownd(usec_t t, char mode, bool
dry_run, bool
warn, const char *message) {
int fd = -1;
struct msghdr msghdr;
struct iovec iovec;
int fd = -1;
struct msghdr msghdr;
struct iovec iovec;
@@
-5432,6
+5432,7
@@
static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) {
zero(c);
c.elapse = t;
c.mode = mode;
zero(c);
c.elapse = t;
c.mode = mode;
+ c.dry_run = dry_run;
c.warn_wall = warn;
if (message)
c.warn_wall = warn;
if (message)
@@
-5527,6
+5528,7
@@
static int halt_main(DBusConnection *bus) {
arg_action == ACTION_HALT ? 'H' :
arg_action == ACTION_POWEROFF ? 'P' :
'r',
arg_action == ACTION_HALT ? 'H' :
arg_action == ACTION_POWEROFF ? 'P' :
'r',
+ arg_dry,
!arg_no_wall,
m);
free(m);
!arg_no_wall,
m);
free(m);
@@
-5774,7
+5776,7
@@
int main(int argc, char*argv[]) {
break;
case ACTION_CANCEL_SHUTDOWN:
break;
case ACTION_CANCEL_SHUTDOWN:
- r = send_shutdownd(0, 0, false, NULL);
+ r = send_shutdownd(0, 0, false,
false,
NULL);
break;
case ACTION_INVALID:
break;
case ACTION_INVALID: