folkslinux
/
eudev
mirror of https://github.com/eudev-project/eudev.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

initctl: properly use isolate when activating runlevels

This commit is contained in:
Lennart Poettering 2010-09-14 01:56:14 +02:00
parent bba34eedc7
commit ac83842a55
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/initctl.c
View File

@ -68,27 +68,32 @@ struct Fifo {
LIST_FIELDS(Fifo, fifo); LIST_FIELDS(Fifo, fifo);
}; };
static const char *translate_runlevel(int runlevel) { static const char *translate_runlevel(int runlevel, bool *isolate) {
static const struct { static const struct {
const int runlevel; const int runlevel;
const char *special; const char *special;
bool isolate;
} table[] = { } table[] = {
{ '0', SPECIAL_POWEROFF_TARGET }, { '0', SPECIAL_POWEROFF_TARGET, false },
{ '1', SPECIAL_RESCUE_TARGET }, { '1', SPECIAL_RESCUE_TARGET, true },
{ 's', SPECIAL_RESCUE_TARGET }, { 's', SPECIAL_RESCUE_TARGET, true },
{ 'S', SPECIAL_RESCUE_TARGET }, { 'S', SPECIAL_RESCUE_TARGET, true },
{ '2', SPECIAL_RUNLEVEL2_TARGET }, { '2', SPECIAL_RUNLEVEL2_TARGET, true },
{ '3', SPECIAL_RUNLEVEL3_TARGET }, { '3', SPECIAL_RUNLEVEL3_TARGET, true },
{ '4', SPECIAL_RUNLEVEL4_TARGET }, { '4', SPECIAL_RUNLEVEL4_TARGET, true },
{ '5', SPECIAL_RUNLEVEL5_TARGET }, { '5', SPECIAL_RUNLEVEL5_TARGET, true },
{ '6', SPECIAL_REBOOT_TARGET }, { '6', SPECIAL_REBOOT_TARGET, false },
}; };
unsigned i; unsigned i;
assert(isolate);
for (i = 0; i < ELEMENTSOF(table); i++) for (i = 0; i < ELEMENTSOF(table); i++)
if (table[i].runlevel == runlevel) if (table[i].runlevel == runlevel) {
*isolate = table[i].isolate;
return table[i].special; return table[i].special;
}
return NULL; return NULL;
} }
@ -97,17 +102,23 @@ static void change_runlevel(Server *s, int runlevel) {
const char *target; const char *target;
DBusMessage *m = NULL, *reply = NULL; DBusMessage *m = NULL, *reply = NULL;
DBusError error; DBusError error;
const char *replace = "replace"; const char *mode;
bool isolate = false;
assert(s); assert(s);
dbus_error_init(&error); dbus_error_init(&error);
if (!(target = translate_runlevel(runlevel))) { if (!(target = translate_runlevel(runlevel, &isolate))) {
log_warning("Got request for unknown runlevel %c, ignoring.", runlevel); log_warning("Got request for unknown runlevel %c, ignoring.", runlevel);
goto finish; goto finish;
} }
if (isolate)
mode = "isolate";
else
mode = "replace";
log_debug("Running request %s", target); log_debug("Running request %s", target);
if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) { if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) {
@ -117,7 +128,7 @@ static void change_runlevel(Server *s, int runlevel) {
if (!dbus_message_append_args(m, if (!dbus_message_append_args(m,
DBUS_TYPE_STRING, &target, DBUS_TYPE_STRING, &target,
DBUS_TYPE_STRING, &replace, DBUS_TYPE_STRING, &mode,
DBUS_TYPE_INVALID)) { DBUS_TYPE_INVALID)) {
log_error("Could not attach target and flag information to message."); log_error("Could not attach target and flag information to message.");
goto finish; goto finish;