diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-24 16:42:42 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-24 16:42:42 +0200 |
| commit | 2b93b027d3a68b5d7ae26d0c2cd487eb5019d2a9 (patch) | |
| tree | 11846b4ad4a4914a244909619ffc7f1f503f7cdf /src/core | |
| parent | a888b352eb53b07daa24fa859ceeb254336b293d (diff) | |
remount: consolidate remount-api-vfs and remount-rootfs into one
This has the advantage of removing a confusing warning by mount if the
root directory is not listed in fstab.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/special.h | 2 | ||||
| -rw-r--r-- | src/core/swap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/special.h b/src/core/special.h index f1ff1b94c0..2db4711c2e 100644 --- a/src/core/special.h +++ b/src/core/special.h @@ -65,7 +65,7 @@ #define SPECIAL_FSCK_SERVICE "fsck@.service" #define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service" #define SPECIAL_QUOTAON_SERVICE "quotaon.service" -#define SPECIAL_REMOUNT_ROOTFS_SERVICE "remount-rootfs.service" +#define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service" /* Services systemd relies on */ #define SPECIAL_DBUS_SERVICE "dbus.service" diff --git a/src/core/swap.c b/src/core/swap.c index fea3f6887a..d2f949118b 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -211,9 +211,9 @@ static int swap_add_device_links(Swap *s) { UNIT(s)->manager->running_as == MANAGER_SYSTEM); else /* File based swap devices need to be ordered after - * remount-rootfs.service, since they might need a + * systemd-remount-fs.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); + return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_FS_SERVICE, NULL, true); } static int swap_add_default_dependencies(Swap *s) { |