chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: rename a few status lines
[elogind.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index 29006712b5e6b76c1de24b2dda05066f84f585a2..4a672fbdffe047560ab2430bfc620ce973c28f4e 100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-195,7
+195,9
@@
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_SYSTEM)) < 0)
+ if ((r = unit_add_node_link(u, s->what,
+ u->meta.manager->running_as == MANAGER_SYSTEM &&
+ u->meta.manager->swap_on_plug)) < 0)
return r;
if ((r = swap_add_mount_links(s)) < 0)
return r;
if ((r = swap_add_mount_links(s)) < 0)
@@
-599,7
+601,9
@@
const UnitVTable swap_vtable = {
.check_gc = swap_check_gc,
.check_gc = swap_check_gc,
+ .bus_interface = "org.freedesktop.systemd1.Swap",
.bus_message_handler = bus_swap_message_handler,
.bus_message_handler = bus_swap_message_handler,
+ .bus_invalidating_properties = bus_swap_invalidating_properties,
.reset_maintenance = swap_reset_maintenance,
.reset_maintenance = swap_reset_maintenance,