summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-22 21:06:38 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-22 21:06:56 +0100
commitcfcfd4aefe2141d324f51033057674d9f1171ef3 (patch)
tree1b71a9d134ac8b60359d718424084ef60833b841
parent16f6682d0b74f3f1f29ef71aa10d20b36e10b48c (diff)
swap: order file-based swap devices after remount-rootfs
-rw-r--r--src/special.h1
-rw-r--r--src/swap.c12
2 files changed, 10 insertions, 3 deletions
diff --git a/src/special.h b/src/special.h
index efd792d19d..df1e1fa417 100644
--- a/src/special.h
+++ b/src/special.h
@@ -65,6 +65,7 @@
#define SPECIAL_DBUS_SOCKET "dbus.socket"
#define SPECIAL_GETTY_TARGET "getty.target"
#define SPECIAL_SERIAL_GETTY_SERVICE "serial-getty@.service"
+#define SPECIAL_REMOUNT_ROOTFS_SERVICE "remount-rootfs.service"
#ifndef SPECIAL_SYSLOG_SERVICE
#define SPECIAL_SYSLOG_SERVICE "syslog.service"
diff --git a/src/swap.c b/src/swap.c
index ec9f157b15..0d3cb2f406 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -199,9 +199,15 @@ static int swap_add_device_links(Swap *s) {
else
return 0;
- return unit_add_node_link(UNIT(s), s->what,
- !p->noauto && p->nofail &&
- s->meta.manager->running_as == MANAGER_SYSTEM);
+ if (is_device_path(s->what))
+ return unit_add_node_link(UNIT(s), s->what,
+ !p->noauto && p->nofail &&
+ s->meta.manager->running_as == MANAGER_SYSTEM);
+ else
+ /* File based swap devices need to be ordered after
+ * remount-rootfs.service, since they might need a
+ * writable file system. */
+ return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_ROOTFS_SERVICE, NULL, true);
}
static int swap_add_default_dependencies(Swap *s) {