swap: order file-based swap devices after remount-rootfs

diff --git a/src/special.h b/src/special.h
index efd792d19da49de932c01644eb0697b2d54de4ad..df1e1fa417c62f9fd8b6a8edac2fb94ffe8d0b1a 100644 (file)
--- 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 ec9f157b156f7bb2e2d33dd46174d31e3759327d..0d3cb2f40622c608865313ff23876f5139bc5c17 100644 (file)
--- 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) {