shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

systemctl: add verbs for special units

Browse Source
This commit is contained in:
Lennart Poettering 2010-06-18 04:22:59 +02:00
parent ef2f1067d0
commit 514f4ef52f
14 changed files with 265 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -19,6 +19,9 @@ systemadm
*~
*.tar.gz
*.o
*.lo
*.a
*.la
.deps/
Makefile.in
aclocal.m4
@ -37,3 +40,6 @@ missing
stamp-*
*.stamp
Makefile
ltmain.sh
*.tar.bz2
libtool

3
Makefile.am
View File

@ -287,7 +287,8 @@ EXTRA_DIST += \
src/securebits.h \
src/linux/auto_dev-ioctl.h \
src/initreq.h \
src/sd-daemon.h
src/sd-daemon.h \
src/special.h
dist_man_MANS = \
man/systemd.unit.5 \

42
man/systemd.special.xml.in
View File

@ -69,13 +69,10 @@
<filename>rescue.target</filename>,
<filename>rpcbind.target</filename>,
<filename>rtc-set.target</filename>,
<filename>runlevel0.target</filename>,
<filename>runlevel1.target</filename>,
<filename>runlevel2.target</filename>,
<filename>runlevel3.target</filename>,
<filename>runlevel4.target</filename>,
<filename>runlevel5.target</filename>,
<filename>runlevel6.target</filename>
<filename>shutdown.target</filename>,
<filename>sigpwr.target</filename>,
<filename>sockets.target</filename>,
@ -414,32 +411,6 @@
facility.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><filename>runlevel0.target</filename></term>
<listitem>
<para>This is a target that is
called whever the SysV
compatibility code asks for
runlevel 0. This is an alias
for
<filename>poweroff.target</filename>,
for compatibility with
SysV.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><filename>runlevel1.target</filename></term>
<listitem>
<para>This is a target that is
called whever the SysV
compatibility code asks for
runlevel 1. This is an alias
for
<filename>rescue.target</filename>,
for compatibility with
SysV.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><filename>runlevel2.target</filename></term>
<listitem>
@ -494,19 +465,6 @@
<filename>graphical.target</filename>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><filename>runlevel6.target</filename></term>
<listitem>
<para>This is a target that is
called whever the SysV
compatibility code asks for
runlevel 6. This is an alias
for
<filename>reboot.target</filename>,
for compatibility with
SysV.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><filename>shutdown.target</filename></term>
<listitem>

12
src/initctl.c
View File

@ -39,7 +39,7 @@
#include "log.h"
#include "list.h"
#include "initreq.h"
#include "manager.h"
#include "special.h"
#include "sd-daemon.h"
#define SERVER_FD_MAX 16
@ -72,15 +72,15 @@ static const char *translate_runlevel(int runlevel) {
const int runlevel;
const char *special;
} table[] = {
{ '0', SPECIAL_RUNLEVEL0_TARGET },
{ '1', SPECIAL_RUNLEVEL1_TARGET },
{ 's', SPECIAL_RUNLEVEL1_TARGET },
{ 'S', SPECIAL_RUNLEVEL1_TARGET },
{ '0', SPECIAL_POWEROFF_TARGET },
{ '1', SPECIAL_RESCUE_TARGET },
{ 's', SPECIAL_RESCUE_TARGET },
{ 'S', SPECIAL_RESCUE_TARGET },
{ '2', SPECIAL_RUNLEVEL2_TARGET },
{ '3', SPECIAL_RUNLEVEL3_TARGET },
{ '4', SPECIAL_RUNLEVEL4_TARGET },
{ '5', SPECIAL_RUNLEVEL5_TARGET },
{ '6', SPECIAL_RUNLEVEL6_TARGET },
{ '6', SPECIAL_REBOOT_TARGET },
};
unsigned i;

11
src/main.c
View File

@ -40,6 +40,7 @@
#include "kmod-setup.h"
#include "load-fragment.h"
#include "fdset.h"
#include "special.h"
static enum {
ACTION_RUN,
@ -222,11 +223,11 @@ static int set_default_unit(const char *u) {
static int parse_proc_cmdline_word(const char *word) {
static const char * const rlmap[] = {
"single", SPECIAL_RUNLEVEL1_TARGET,
"-s", SPECIAL_RUNLEVEL1_TARGET,
"s", SPECIAL_RUNLEVEL1_TARGET,
"S", SPECIAL_RUNLEVEL1_TARGET,
"1", SPECIAL_RUNLEVEL1_TARGET,
"single", SPECIAL_RESCUE_TARGET,
"-s", SPECIAL_RESCUE_TARGET,
"s", SPECIAL_RESCUE_TARGET,
"S", SPECIAL_RESCUE_TARGET,
"1", SPECIAL_RESCUE_TARGET,
"2", SPECIAL_RUNLEVEL2_TARGET,
"3", SPECIAL_RUNLEVEL3_TARGET,
"4", SPECIAL_RUNLEVEL4_TARGET,

1
src/manager.c
View File

@ -53,6 +53,7 @@
#include "dbus-job.h"
#include "missing.h"
#include "path-lookup.h"
#include "special.h"
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
#define GC_QUEUE_ENTRIES_MAX 16

51
src/manager.h
View File

@ -85,57 +85,6 @@ struct Watch {
#include "dbus.h"
#include "path-lookup.h"
#define SPECIAL_DEFAULT_TARGET "default.target"
/* This is not really intended to be started by directly. This is
* mostly so that other targets (reboot/halt/poweroff) can depend on
* it to bring all services down that want to be brought down on
* system shutdown. */
#define SPECIAL_SHUTDOWN_TARGET "shutdown.target"
#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
#define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
#define SPECIAL_SIGPWR_TARGET "sigpwr.target"
#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
#define SPECIAL_LOCAL_FS_TARGET "local-fs.target" /* LSB's $local_fs */
#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" /* LSB's $remote_fs */
#define SPECIAL_SWAP_TARGET "swap.target"
#define SPECIAL_NETWORK_TARGET "network.target" /* LSB's $network */
#define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target" /* LSB's $named */
#define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */
#define SPECIAL_SYSLOG_TARGET "syslog.target" /* LSB's $syslog; Should pull in syslog.socket or syslog.service */
#define SPECIAL_RTC_SET_TARGET "rtc-set.target" /* LSB's $time */
#define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Debian's $x-display-manager */
#define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Debian's $mail-{transport|transfer-agent */
#define SPECIAL_BASIC_TARGET "basic.target"
#define SPECIAL_SYSINIT_TARGET "sysinit.target"
#define SPECIAL_RESCUE_TARGET "rescue.target"
#define SPECIAL_EXIT_SERVICE "exit.service"
#define SPECIAL_EMERGENCY_SERVICE "emergency.service"
#define SPECIAL_HALT_TARGET "halt.target"
#define SPECIAL_POWEROFF_TARGET "poweroff.target"
#define SPECIAL_REBOOT_TARGET "reboot.target"
#ifndef SPECIAL_DBUS_SERVICE
#define SPECIAL_DBUS_SERVICE "dbus.service"
#endif
#ifndef SPECIAL_SYSLOG_SERVICE
#define SPECIAL_SYSLOG_SERVICE "syslog.service"
#endif
/* For SysV compatibility. Usually an alias for a saner target. On
* SysV-free systems this doesn't exist. */
#define SPECIAL_RUNLEVEL0_TARGET "runlevel0.target"
#define SPECIAL_RUNLEVEL1_TARGET "runlevel1.target"
#define SPECIAL_RUNLEVEL2_TARGET "runlevel2.target"
#define SPECIAL_RUNLEVEL3_TARGET "runlevel3.target"
#define SPECIAL_RUNLEVEL4_TARGET "runlevel4.target"
#define SPECIAL_RUNLEVEL5_TARGET "runlevel5.target"
#define SPECIAL_RUNLEVEL6_TARGET "runlevel6.target"
struct Manager {
uint32_t current_job_id;

1
src/mount.c
View File

@ -35,6 +35,7 @@
#include "unit-name.h"
#include "mount.h"
#include "dbus-mount.h"
#include "special.h"
static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
[MOUNT_DEAD] = UNIT_INACTIVE,

7
src/service.c
View File

@ -32,6 +32,7 @@
#include "strv.h"
#include "unit-name.h"
#include "dbus-service.h"
#include "special.h"
#define COMMENTS "#;\n"
#define NEWLINES "\n\r"
@ -49,13 +50,13 @@ static const struct {
const RunlevelType type;
} rcnd_table[] = {
/* Standard SysV runlevels */
{ "rc0.d", SPECIAL_RUNLEVEL0_TARGET, RUNLEVEL_DOWN },
{ "rc1.d", SPECIAL_RUNLEVEL1_TARGET, RUNLEVEL_UP },
{ "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
{ "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP },
{ "rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP },
{ "rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP },
{ "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP },
{ "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP },
{ "rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN },
{ "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN },
/* SUSE style boot.d */
{ "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },

73
src/special.h Normal file
View File

@ -0,0 +1,73 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
#ifndef foospecialhfoo
#define foospecialhfoo
/***
This file is part of systemd.
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#define SPECIAL_DEFAULT_TARGET "default.target"
/* This is not really intended to be started by directly. This is
* mostly so that other targets (reboot/halt/poweroff) can depend on
* it to bring all services down that want to be brought down on
* system shutdown. */
#define SPECIAL_SHUTDOWN_TARGET "shutdown.target"
#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
#define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
#define SPECIAL_SIGPWR_TARGET "sigpwr.target"
#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
#define SPECIAL_LOCAL_FS_TARGET "local-fs.target" /* LSB's $local_fs */
#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" /* LSB's $remote_fs */
#define SPECIAL_SWAP_TARGET "swap.target"
#define SPECIAL_NETWORK_TARGET "network.target" /* LSB's $network */
#define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target" /* LSB's $named */
#define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */
#define SPECIAL_SYSLOG_TARGET "syslog.target" /* LSB's $syslog; Should pull in syslog.socket or syslog.service */
#define SPECIAL_RTC_SET_TARGET "rtc-set.target" /* LSB's $time */
#define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Debian's $x-display-manager */
#define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Debian's $mail-{transport|transfer-agent */
#define SPECIAL_BASIC_TARGET "basic.target"
#define SPECIAL_SYSINIT_TARGET "sysinit.target"
#define SPECIAL_RESCUE_TARGET "rescue.target"
#define SPECIAL_EXIT_SERVICE "exit.service"
#define SPECIAL_EMERGENCY_SERVICE "emergency.service"
#define SPECIAL_HALT_TARGET "halt.target"
#define SPECIAL_POWEROFF_TARGET "poweroff.target"
#define SPECIAL_REBOOT_TARGET "reboot.target"
#ifndef SPECIAL_DBUS_SERVICE
#define SPECIAL_DBUS_SERVICE "dbus.service"
#endif
#ifndef SPECIAL_SYSLOG_SERVICE
#define SPECIAL_SYSLOG_SERVICE "syslog.service"
#endif
/* For SysV compatibility. Usually an alias for a saner target. On
* SysV-free systems this doesn't exist. */
#define SPECIAL_RUNLEVEL2_TARGET "runlevel2.target"
#define SPECIAL_RUNLEVEL3_TARGET "runlevel3.target"
#define SPECIAL_RUNLEVEL4_TARGET "runlevel4.target"
#define SPECIAL_RUNLEVEL5_TARGET "runlevel5.target"
#endif

1
src/swap.c
View File

@ -33,6 +33,7 @@
#include "load-dropin.h"
#include "unit-name.h"
#include "dbus-swap.h"
#include "special.h"
static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE,

221
src/systemctl.c
View File

@ -36,6 +36,7 @@
#include "macro.h"
#include "set.h"
#include "utmp-wtmp.h"
#include "special.h"
static const char *arg_type = NULL;
static bool arg_all = false;
@ -45,6 +46,7 @@ static bool arg_block = false;
static bool arg_immediate = false;
static bool arg_no_wtmp = false;
static bool arg_no_sync = false;
static bool arg_no_wall = false;
static bool arg_dry = false;
static char **arg_wall = NULL;
enum action {
@ -58,6 +60,8 @@ enum action {
ACTION_RUNLEVEL4,
ACTION_RUNLEVEL5,
ACTION_RESCUE,
ACTION_EMERGENCY,
ACTION_DEFAULT,
ACTION_RELOAD,
ACTION_REEXEC,
ACTION_RUNLEVEL,
@ -66,6 +70,8 @@ enum action {
static bool error_is_no_service(DBusError *error) {
assert(error);
if (!dbus_error_is_set(error))
return false;
@ -80,6 +86,9 @@ static bool error_is_no_service(DBusError *error) {
static int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *data, bool next) {
assert(iter);
assert(data);
if (dbus_message_iter_get_arg_type(iter) != type)
return -EIO;
@ -116,18 +125,22 @@ static int columns(void) {
}
static void warn_wall(void) {
static void warn_wall(enum action action) {
static const char *table[_ACTION_MAX] = {
[ACTION_HALT] = "The system is going down for system halt NOW!",
[ACTION_REBOOT] = "The system is going down for reboot NOW!",
[ACTION_POWEROFF] = "The system is going down for power-off NOW!",
[ACTION_RESCUE] = "The system is going down to rescue mode NOW!"
[ACTION_HALT] = "The system is going down for system halt NOW!",
[ACTION_REBOOT] = "The system is going down for reboot NOW!",
[ACTION_POWEROFF] = "The system is going down for power-off NOW!",
[ACTION_RESCUE] = "The system is going down to rescue mode NOW!",
[ACTION_EMERGENCY] = "The system is going down to emergency mode NOW!"
};
if (!table[arg_action])
if (arg_no_wall)
return;
utmp_wall(table[arg_action]);
if (!table[action])
return;
utmp_wall(table[action]);
}
static int list_units(DBusConnection *bus, char **args, unsigned n) {
@ -139,6 +152,8 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
dbus_error_init(&error);
assert(bus);
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
@ -247,6 +262,8 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) {
dbus_error_init(&error);
assert(bus);
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
@ -326,6 +343,9 @@ static int load_unit(DBusConnection *bus, char **args, unsigned n) {
dbus_error_init(&error);
assert(bus);
assert(args);
for (i = 1; i < n; i++) {
if (!(m = dbus_message_new_method_call(
@ -380,6 +400,9 @@ static int cancel_job(DBusConnection *bus, char **args, unsigned n) {
dbus_error_init(&error);
assert(bus);
assert(args);
for (i = 1; i < n; i++) {
unsigned id;
const char *path;
@ -669,72 +692,100 @@ finish:
return r;
}
static enum action verb_to_action(const char *verb) {
if (streq(verb, "halt"))
return ACTION_HALT;
else if (streq(verb, "poweroff"))
return ACTION_POWEROFF;
else if (streq(verb, "reboot"))
return ACTION_REBOOT;
else if (streq(verb, "rescue"))
return ACTION_RESCUE;
else if (streq(verb, "emergency"))
return ACTION_EMERGENCY;
else if (streq(verb, "default"))
return ACTION_DEFAULT;
else
return ACTION_INVALID;
}
static int start_unit(DBusConnection *bus, char **args, unsigned n) {
static const char * const table[_ACTION_MAX] = {
[ACTION_HALT] = "halt.target",
[ACTION_POWEROFF] = "poweroff.target",
[ACTION_REBOOT] = "reboot.target",
[ACTION_RUNLEVEL2] = "runlevel2.target",
[ACTION_RUNLEVEL3] = "runlevel3.target",
[ACTION_RUNLEVEL4] = "runlevel4.target",
[ACTION_RUNLEVEL5] = "runlevel5.target",
[ACTION_RESCUE] = "rescue.target"
[ACTION_HALT] = SPECIAL_HALT_TARGET,
[ACTION_POWEROFF] = SPECIAL_POWEROFF_TARGET,
[ACTION_REBOOT] = SPECIAL_REBOOT_TARGET,
[ACTION_RUNLEVEL2] = SPECIAL_RUNLEVEL2_TARGET,
[ACTION_RUNLEVEL3] = SPECIAL_RUNLEVEL3_TARGET,
[ACTION_RUNLEVEL4] = SPECIAL_RUNLEVEL4_TARGET,
[ACTION_RUNLEVEL5] = SPECIAL_RUNLEVEL5_TARGET,
[ACTION_RESCUE] = SPECIAL_RESCUE_TARGET,
[ACTION_EMERGENCY] = SPECIAL_EMERGENCY_SERVICE,
[ACTION_DEFAULT] = SPECIAL_DEFAULT_TARGET
};
int r;
unsigned i;
const char *method, *mode;
const char *method, *mode, *one_name;
Set *s = NULL;
assert(bus);
if (arg_action == ACTION_SYSTEMCTL) {
method =
streq(args[0], "start") ? "StartUnit" :
streq(args[0], "stop") ? "StopUnit" :
streq(args[0], "reload") ? "ReloadUnit" :
streq(args[0], "restart") ? "RestartUnit" :
/* isolate */ "StartUnit";
"StartUnit";
mode =
streq(args[0], "isolate") ? "isolate" :
arg_replace ? "replace" :
"fail";
(streq(args[0], "isolate") ||
streq(args[0], "rescue") ||
streq(args[0], "emergency")) ? "isolate" :
arg_replace ? "replace" :
"fail";
if (arg_block) {
if ((r = enable_wait_for_jobs(bus)) < 0) {
log_error("Could not watch jobs: %s", strerror(-r));
goto finish;
}
one_name = table[verb_to_action(args[0])];
if (!(s = set_new(string_hash_func, string_compare_func))) {
log_error("Failed to allocate set.");
r = -ENOMEM;
goto finish;
}
}
} else {
assert(arg_action < ELEMENTSOF(table));
assert(table[arg_action]);
method = "StartUnit";
mode = arg_action == ACTION_RESCUE ? "isolate" : "replace";
mode = (arg_action == ACTION_EMERGENCY ||
arg_action == ACTION_RESCUE) ? "isolate" : "replace";
one_name = table[arg_action];
}
if (arg_block) {
if ((r = enable_wait_for_jobs(bus)) < 0) {
log_error("Could not watch jobs: %s", strerror(-r));
goto finish;
}
if (!(s = set_new(string_hash_func, string_compare_func))) {
log_error("Failed to allocate set.");
r = -ENOMEM;
goto finish;
}
}
r = 0;
if (arg_action == ACTION_SYSTEMCTL) {
if (one_name) {
if ((r = start_unit_one(bus, method, one_name, mode, s)) <= 0)
goto finish;
} else {
for (i = 1; i < n; i++)
if ((r = start_unit_one(bus, method, args[i], mode, s)) < 0)
goto finish;
if (arg_block)
r = wait_for_jobs(bus, s);
} else {
if ((r = start_unit_one(bus, method, table[arg_action], mode, s)) <= 0)
goto finish;
}
if (arg_block)
r = wait_for_jobs(bus, s);
finish:
if (s)
set_free_free(s);
@ -742,6 +793,15 @@ finish:
return r;
}
static int start_special(DBusConnection *bus, char **args, unsigned n) {
assert(bus);
assert(args);
warn_wall(verb_to_action(args[0]));
return start_unit(bus, args, n);
}
static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage *message, void *data) {
DBusError error;
DBusMessage *m = NULL, *reply = NULL;
@ -1322,14 +1382,15 @@ finish:
static int systemctl_help(void) {
printf("%s [options]\n\n"
"Send control commands to the init system.\n\n"
"Send control commands to the init daemon.\n\n"
" -h --help Show this help\n"
" -t --type=TYPE List only units of a particular type\n"
" -a --all Show all units, including dead ones\n"
" --replace When installing a new job, replace existing conflicting ones\n"
" --system Connect to system bus\n"
" --session Connect to session bus\n"
" --block Wait until operation finished\n\n"
" --block Wait until operation finished\n"
" --no-wall Don't send wall message before reboot/halt/power-off\n\n"
"Commands:\n"
" list-units List units\n"
" list-jobs List jobs\n"
@ -1344,12 +1405,18 @@ static int systemctl_help(void) {
" monitor Monitor unit/job changes\n"
" dump Dump server status\n"
" snapshot [NAME] Create a snapshot\n"
" daemon-reload Reload daemon configuration\n"
" daemon-reexecute Reexecute daemon\n"
" daemon-exit Ask the daemon to quit\n"
" daemon-reload Reload init daemon configuration\n"
" daemon-reexecute Reexecute init daemon\n"
" daemon-exit Ask the init daemon to quit\n"
" show-environment Dump environment\n"
" set-environment [NAME=VALUE...] Set one or more environment variables\n"
" unset-environment [NAME...] Unset one or more environment variables\n",
" unset-environment [NAME...] Unset one or more environment variables\n"
" halt Shut down and halt the system\n"
" reboot Shut down and reboot the system\n"
" poweroff Shut down and power off the system\n"
" default Enter default mode\n"
" rescue Enter rescue mode\n"
" emergency Enter emergency mode\n",
program_invocation_short_name);
return 0;
@ -1366,7 +1433,8 @@ static int halt_help(void) {
" -f --force Force immediate reboot/halt/power-off\n"
" -w --wtmp-only Don't reboot/halt/power-off, just write wtmp record\n"
" -d --no-wtmp Don't write wtmp record\n"
" -n --no-sync Don't sync before reboot/halt/power-off\n",
" -n --no-sync Don't sync before reboot/halt/power-off\n"
" --no-wall Don't send wall message before reboot/halt/power-off\n",
program_invocation_short_name,
arg_action == ACTION_REBOOT ? "Reboot" :
arg_action == ACTION_POWEROFF ? "Power off" :
@ -1377,14 +1445,15 @@ static int halt_help(void) {
static int shutdown_help(void) {
printf("%s [options] [TIME] [WALL...]\n\n"
printf("%s [options] [IGNORED] [WALL...]\n\n"
"Shut down the system.\n\n"
" --help Show this help\n"
" -H --halt Halt the machine\n"
" -P --poweroff Power-off the machine\n"
" -r --reboot Reboot the machine\n"
" -h Equivalent to --poweroff, overriden by --halt\n"
" -k Don't reboot/halt/power-off, just send warnings\n",
" -k Don't reboot/halt/power-off, just send warnings\n"
" --no-wall Don't send wall message before reboot/halt/power-off\n",
program_invocation_short_name);
return 0;
@ -1393,15 +1462,16 @@ static int shutdown_help(void) {
static int telinit_help(void) {
printf("%s [options]\n\n"
"Send control commands to the init system.\n\n"
" --help Show this help\n\n"
"Send control commands to the init daemon.\n\n"
" --help Show this help\n"
" --no-wall Don't send wall message before reboot/halt/power-off\n\n"
"Commands:\n"
" 0 Power-off the machine\n"
" 6 Reboot the machine\n"
" 1, 2, 3, 4, 5 Start runlevelX.target unit\n"
" s, S Start the rescue.target unit\n"
" q, Q Ask systemd to reload its configuration\n"
" u, U Ask systemd to reexecute itself\n",
" 2, 3, 4, 5 Start runlevelX.target unit\n"
" 1, s, S Enter rescue mode\n"
" q, Q Reload init daemon configuration\n"
" u, U Reexecute init daemon\n",
program_invocation_short_name);
return 0;
@ -1423,7 +1493,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
ARG_REPLACE = 0x100,
ARG_SESSION,
ARG_SYSTEM,
ARG_BLOCK
ARG_BLOCK,
ARG_NO_WALL
};
static const struct option options[] = {
@ -1434,6 +1505,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
{ "session", no_argument, NULL, ARG_SESSION },
{ "system", no_argument, NULL, ARG_SYSTEM },
{ "block", no_argument, NULL, ARG_BLOCK },
{ "no-wall", no_argument, NULL, ARG_NO_WALL },
{ NULL, 0, NULL, 0 }
};
@ -1474,6 +1546,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
arg_block = true;
break;
case ARG_NO_WALL:
arg_no_wall = true;
break;
case '?':
return -EINVAL;
@ -1491,7 +1567,8 @@ static int halt_parse_argv(int argc, char *argv[]) {
enum {
ARG_HELP = 0x100,
ARG_HALT,
ARG_REBOOT
ARG_REBOOT,
ARG_NO_WALL
};
static const struct option options[] = {
@ -1503,6 +1580,7 @@ static int halt_parse_argv(int argc, char *argv[]) {
{ "wtmp-only", no_argument, NULL, 'w' },
{ "no-wtmp", no_argument, NULL, 'd' },
{ "no-sync", no_argument, NULL, 'n' },
{ "no-wall", no_argument, NULL, ARG_NO_WALL },
{ NULL, 0, NULL, 0 }
};
@ -1550,6 +1628,10 @@ static int halt_parse_argv(int argc, char *argv[]) {
arg_no_sync = true;
break;
case ARG_NO_WALL:
arg_no_wall = true;
break;
case 'i':
case 'h':
/* Compatibility nops */
@ -1576,6 +1658,7 @@ static int shutdown_parse_argv(int argc, char *argv[]) {
enum {
ARG_HELP = 0x100,
ARG_NO_WALL
};
static const struct option options[] = {
@ -1583,6 +1666,7 @@ static int shutdown_parse_argv(int argc, char *argv[]) {
{ "halt", no_argument, NULL, 'H' },
{ "poweroff", no_argument, NULL, 'P' },
{ "reboot", no_argument, NULL, 'r' },
{ "no-wall", no_argument, NULL, ARG_NO_WALL },
{ NULL, 0, NULL, 0 }
};
@ -1619,6 +1703,10 @@ static int shutdown_parse_argv(int argc, char *argv[]) {
arg_dry = true;
break;
case ARG_NO_WALL:
arg_no_wall = true;
break;
case 't':
case 'a':
/* Compatibility nops */
@ -1647,10 +1735,12 @@ static int telinit_parse_argv(int argc, char *argv[]) {
enum {
ARG_HELP = 0x100,
ARG_NO_WALL
};
static const struct option options[] = {
{ "help", no_argument, NULL, ARG_HELP },
{ "no-wall", no_argument, NULL, ARG_NO_WALL },
{ NULL, 0, NULL, 0 }
};
@ -1686,6 +1776,10 @@ static int telinit_parse_argv(int argc, char *argv[]) {
telinit_help();
return 0;
case ARG_NO_WALL:
arg_no_wall = true;
break;
case '?':
return -EINVAL;
@ -1838,6 +1932,12 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) {
{ "show-environment", EQUAL, 1, show_enviroment },
{ "set-environment", MORE, 2, set_environment },
{ "unset-environment", MORE, 2, set_environment },
{ "halt", EQUAL, 1, start_special },
{ "poweroff", EQUAL, 1, start_special },
{ "reboot", EQUAL, 1, start_special },
{ "default", EQUAL, 1, start_special },
{ "rescue", EQUAL, 1, start_special },
{ "emergency", EQUAL, 1, start_special },
};
int left;
@ -1919,7 +2019,7 @@ static int reload_with_fallback(DBusConnection *bus) {
static int start_with_fallback(DBusConnection *bus) {
int r;
warn_wall();
warn_wall(arg_action);
if (bus) {
/* First, try systemd via D-Bus. */
@ -1943,8 +2043,6 @@ static int halt_main(DBusConnection *bus) {
if (!arg_immediate)
return start_with_fallback(bus);
warn_wall();
if (!arg_no_wtmp)
if ((r = utmp_put_shutdown(0)) < 0)
log_warning("Failed to write utmp record: %s", strerror(-r));
@ -2049,6 +2147,7 @@ int main(int argc, char*argv[]) {
case ACTION_RUNLEVEL4:
case ACTION_RUNLEVEL5:
case ACTION_RESCUE:
case ACTION_EMERGENCY:
retval = start_with_fallback(bus) < 0;
break;

7
src/target.c
View File

@ -27,6 +27,7 @@
#include "load-fragment.h"
#include "log.h"
#include "dbus-target.h"
#include "special.h"
static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
[TARGET_DEAD] = UNIT_INACTIVE,
@ -147,9 +148,9 @@ int target_get_runlevel(Target *t) {
{ SPECIAL_RUNLEVEL4_TARGET, '4' },
{ SPECIAL_RUNLEVEL3_TARGET, '3' },
{ SPECIAL_RUNLEVEL2_TARGET, '2' },
{ SPECIAL_RUNLEVEL1_TARGET, '1' },
{ SPECIAL_RUNLEVEL0_TARGET, '0' },
{ SPECIAL_RUNLEVEL6_TARGET, '6' },
{ SPECIAL_RESCUE_TARGET, '1' },
{ SPECIAL_POWEROFF_TARGET, '0' },
{ SPECIAL_REBOOT_TARGET, '6' },
};
unsigned i;

1
src/unit.c
View File

@ -38,6 +38,7 @@
#include "unit-name.h"
#include "specifier.h"
#include "dbus-unit.h"
#include "special.h"
const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = &service_vtable,