chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: add new abstracted maintenance state for units
[elogind.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index 5b3073bd4ae9b0204e79e076f48771cd97b6c499..e2afcc02eb4933c6b639c7062807d619d6dd63dc 100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-38,7
+38,7
@@
static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE,
[SWAP_ACTIVE] = UNIT_ACTIVE,
static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE,
[SWAP_ACTIVE] = UNIT_ACTIVE,
- [SWAP_MAINTENANCE] = UNIT_INACTIVE
+ [SWAP_MAINTENANCE] = UNIT_INACTIVE
_MAINTENANCE
};
static void swap_init(Unit *u) {
};
static void swap_init(Unit *u) {
@@
-116,7
+116,7
@@
static int swap_add_target_links(Swap *s) {
if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, &tu)) < 0)
return r;
if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, &tu)) < 0)
return r;
- if (!p->noauto && p->handle && s->meta.manager->running_as
!= MANAGER_SESSION
)
+ if (!p->noauto && p->handle && s->meta.manager->running_as
== MANAGER_SYSTEM
)
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
@@
-127,7
+127,7
@@
static int swap_verify(Swap *s) {
bool b;
char *e;
bool b;
char *e;
- if (
UNIT(s)
->meta.load_state != UNIT_LOADED)
+ if (
s
->meta.load_state != UNIT_LOADED)
return 0;
if (!(e = unit_name_from_path(s->what, ".swap")))
return 0;
if (!(e = unit_name_from_path(s->what, ".swap")))
@@
-137,7
+137,7
@@
static int swap_verify(Swap *s) {
free(e);
if (!b) {
free(e);
if (!b) {
- log_error("%s: Value of \"What\" and unit name do not match, not loading.\n",
UNIT(s)
->meta.id);
+ log_error("%s: Value of \"What\" and unit name do not match, not loading.\n",
s
->meta.id);
return -EINVAL;
}
return -EINVAL;
}
@@
-180,9
+180,7
@@
static int swap_load(Unit *u) {
if ((r = unit_set_description(u, s->what)) < 0)
return r;
if ((r = unit_set_description(u, s->what)) < 0)
return r;
- if ((r = unit_add_node_link(u, s->what,
- (u->meta.manager->running_as == MANAGER_INIT ||
- u->meta.manager->running_as == MANAGER_SYSTEM))) < 0)
+ if ((r = unit_add_node_link(u, s->what, u->meta.manager->running_as == MANAGER_SYSTEM)) < 0)
return r;
if ((r = swap_add_mount_links(s)) < 0)
return r;
if ((r = swap_add_mount_links(s)) < 0)
@@
-322,7
+320,7
@@
static void swap_set_state(Swap *s, SwapState state) {
if (state != old_state)
log_debug("%s changed %s -> %s",
if (state != old_state)
log_debug("%s changed %s -> %s",
-
UNIT(s)
->meta.id,
+
s
->meta.id,
swap_state_to_string(old_state),
swap_state_to_string(state));
swap_state_to_string(old_state),
swap_state_to_string(state));