From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 20 Dec 2018 15:20:06 +0000 (+0100)
Subject: Define macro for systemd-fsck-root.service
X-Git-Tag: v242-rc1~306^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ff8da1057db35fe8c2256c78d0a9fca93fd184b;p=thirdparty%2Fsystemd.git

Define macro for systemd-fsck-root.service

There is one for systemd-fsck@.service, so for consistency...
---

diff --git a/src/basic/special.h b/src/basic/special.h
index 7bb29772979..add1c1d507e 100644
--- a/src/basic/special.h
+++ b/src/basic/special.h
@@ -76,6 +76,7 @@
 
 /* Magic early boot services */
 #define SPECIAL_FSCK_SERVICE "systemd-fsck@.service"
+#define SPECIAL_FSCK_ROOT_SERVICE "systemd-fsck-root.service"
 #define SPECIAL_QUOTACHECK_SERVICE "systemd-quotacheck.service"
 #define SPECIAL_QUOTAON_SERVICE "quotaon.service"
 #define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service"
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 55bd024f9e9..b2085040f06 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -86,7 +86,7 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) {
         if (!escaped2)
                 return log_oom();
 
-        unit = strjoina(dir, "/systemd-fsck-root.service");
+        unit = strjoina(dir, "/"SPECIAL_FSCK_ROOT_SERVICE);
         log_debug("Creating %s", unit);
 
         r = unit_name_from_path(what, ".device", &device);
@@ -158,10 +158,10 @@ int generator_write_fsck_deps(
         if (path_equal(where, "/")) {
                 const char *lnk;
 
-                lnk = strjoina(dir, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service");
+                lnk = strjoina(dir, "/" SPECIAL_LOCAL_FS_TARGET ".wants/"SPECIAL_FSCK_ROOT_SERVICE);
 
                 mkdir_parents(lnk, 0755);
-                if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-fsck-root.service", lnk) < 0)
+                if (symlink(SYSTEM_DATA_UNIT_PATH "/"SPECIAL_FSCK_ROOT_SERVICE, lnk) < 0)
                         return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
 
         } else {
@@ -173,7 +173,7 @@ int generator_write_fsck_deps(
                         if (r < 0)
                                 return r;
 
-                        fsck = "systemd-fsck-root.service";
+                        fsck = SPECIAL_FSCK_ROOT_SERVICE;
                 } else {
                         r = unit_name_from_path_instance("systemd-fsck", what, ".service", &_fsck);
                         if (r < 0)
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 0d3674cff86..959d6d4614c 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -759,7 +759,7 @@ static void test_unit_name_from_dbus_path(void) {
         test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dcoredump_2esocket", 0, "systemd-coredump.socket");
         test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dcoredump_400_2eservice", 0, "systemd-coredump@0.service");
         test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dfirstboot_2eservice", 0, "systemd-firstboot.service");
-        test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dfsck_2droot_2eservice", 0, "systemd-fsck-root.service");
+        test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dfsck_2droot_2eservice", 0, SPECIAL_FSCK_ROOT_SERVICE);
         test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dhwdb_2dupdate_2eservice", 0, "systemd-hwdb-update.service");
         test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dinitctl_2eservice", 0, "systemd-initctl.service");
         test_unit_name_from_dbus_path_one("/org/freedesktop/systemd1/unit/systemd_2dinitctl_2esocket", 0, "systemd-initctl.socket");