shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-03 13:47:04 +03:00
Code

unit: rename 'banned' load state to 'masked'

Browse Source
This commit is contained in:
Lennart Poettering 2010-10-08 18:21:52 +02:00
parent 169c1bda80
commit 6daf4f9001
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
man/systemd.unit.xml
View File

@ -190,6 +190,14 @@
string before the @, i.e. "getty" in the example
above, where "tty3" is the instance name.</para>
<para>If a unit file is empty (i.e. has the file size
0) or is symlinked to <filename>/dev/null</filename>
its configuration will not be loaded and it appears
with a load state of <literal>masked</literal>, and
cannot be activated. Use this as an effective way to
fully disable a unit, making it impossible to start it
even manually.</para>
<para>The unit file format is covered by the
<ulink
url="http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface

2
src/bus-errors.h
View File

@ -37,7 +37,7 @@
#define BUS_ERROR_ONLY_BY_DEPENDENCY "org.freedesktop.systemd1.OnlyByDependency"
#define BUS_ERROR_NO_ISOLATION "org.freedesktop.systemd1.NoIsolation"
#define BUS_ERROR_LOAD_FAILED "org.freedesktop.systemd1.LoadFailed"
#define BUS_ERROR_BANNED "org.freedesktop.systemd1.Banned"
#define BUS_ERROR_MASKED "org.freedesktop.systemd1.Masked"
#define BUS_ERROR_JOB_TYPE_NOT_APPLICABLE "org.freedesktop.systemd1.JobTypeNotApplicable"
#define BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE "org.freedesktop.systemd1.TransactionIsDestructive"
#define BUS_ERROR_TRANSACTION_JOBS_CONFLICTING "org.freedesktop.systemd1.TransactionJobsConflicting"

2
src/load-fragment.c
View File

@ -1885,7 +1885,7 @@ static int load_from_path(Unit *u, const char *path) {
}
if (null_or_empty(&st))
u->meta.load_state = UNIT_BANNED;
u->meta.load_state = UNIT_MASKED;
else {
/* Now, parse the file contents */
if ((r = config_parse(filename, f, sections, items, false, u)) < 0)

8
src/main.c
View File

@ -1062,8 +1062,8 @@ int main(int argc, char *argv[]) {
dbus_error_free(&error);
} else if (target->meta.load_state == UNIT_ERROR)
log_error("Failed to load default target: %s", strerror(-target->meta.load_error));
else if (target->meta.load_state == UNIT_BANNED)
log_error("Default target banned.");
else if (target->meta.load_state == UNIT_MASKED)
log_error("Default target masked.");
if (!target || target->meta.load_state != UNIT_LOADED) {
log_info("Trying to load rescue target...");
@ -1075,8 +1075,8 @@ int main(int argc, char *argv[]) {
} else if (target->meta.load_state == UNIT_ERROR) {
log_error("Failed to load rescue target: %s", strerror(-target->meta.load_error));
goto finish;
} else if (target->meta.load_state == UNIT_BANNED) {
log_error("Rescue target banned.");
} else if (target->meta.load_state == UNIT_MASKED) {
log_error("Rescue target masked.");
goto finish;
}
}

6
src/manager.c
View File

@ -1400,7 +1400,7 @@ static int transaction_add_job_and_dependencies(
if (unit->meta.load_state != UNIT_LOADED &&
unit->meta.load_state != UNIT_ERROR &&
unit->meta.load_state != UNIT_BANNED) {
unit->meta.load_state != UNIT_MASKED) {
dbus_set_error(e, BUS_ERROR_LOAD_FAILED, "Unit %s is not loaded properly.", unit->meta.id);
return -EINVAL;
}
@ -1414,8 +1414,8 @@ static int transaction_add_job_and_dependencies(
return -EINVAL;
}
if (type != JOB_STOP && unit->meta.load_state == UNIT_BANNED) {
dbus_set_error(e, BUS_ERROR_BANNED, "Unit %s is banned.", unit->meta.id);
if (type != JOB_STOP && unit->meta.load_state == UNIT_MASKED) {
dbus_set_error(e, BUS_ERROR_MASKED, "Unit %s is masked.", unit->meta.id);
return -EINVAL;
}

2
src/unit.c
View File

@ -2237,7 +2237,7 @@ static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
[UNIT_LOADED] = "loaded",
[UNIT_ERROR] = "error",
[UNIT_MERGED] = "merged",
[UNIT_BANNED] = "banned"
[UNIT_MASKED] = "masked"
};
DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState);

2
src/unit.h
View File

@ -62,7 +62,7 @@ enum UnitLoadState {
UNIT_LOADED,
UNIT_ERROR,
UNIT_MERGED,
UNIT_BANNED,
UNIT_MASKED,
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
};