summaryrefslogtreecommitdiffstats
path: root/src/shared/generator.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-05-16 16:44:47 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-05-19 03:25:26 +0200
commit835cf75aefae4402d36e202aad453a98d36b1482 (patch)
tree7169cf1cebbf4de1145997096a0c789a15ddcab5 /src/shared/generator.c
parentrpm: use %_bindir not @bindir@ (diff)
downloadsystemd-835cf75aefae4402d36e202aad453a98d36b1482.tar.xz
systemd-835cf75aefae4402d36e202aad453a98d36b1482.zip
meson: use jinja2 for rpm templates
The naming of variables is very inconsistent. I tried to use more modern style naming (UNDERSCORED_TITLE_CASE), but I didn't change existing names too much. Only SYSTEM_DATA_UNIT_PATH is renamed to SYSTEM_DATA_UNIT_DIR to match SYSTEM_CONFIG_UNIT_DIR.
Diffstat (limited to 'src/shared/generator.c')
-rw-r--r--src/shared/generator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 4be1dd4ff4..3967edfa06 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -185,7 +185,7 @@ int generator_write_fsck_deps(
lnk = strjoina(dir, "/" SPECIAL_LOCAL_FS_TARGET ".wants/" SPECIAL_FSCK_ROOT_SERVICE);
(void) mkdir_parents(lnk, 0755);
- if (symlink(SYSTEM_DATA_UNIT_PATH "/" SPECIAL_FSCK_ROOT_SERVICE, lnk) < 0)
+ if (symlink(SYSTEM_DATA_UNIT_DIR "/" SPECIAL_FSCK_ROOT_SERVICE, lnk) < 0)
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
} else {
@@ -561,7 +561,7 @@ int generator_hook_up_growfs(
int generator_enable_remount_fs_service(const char *dir) {
/* Pull in systemd-remount-fs.service */
return generator_add_symlink(dir, SPECIAL_LOCAL_FS_TARGET, "wants",
- SYSTEM_DATA_UNIT_PATH "/" SPECIAL_REMOUNT_FS_SERVICE);
+ SYSTEM_DATA_UNIT_DIR "/" SPECIAL_REMOUNT_FS_SERVICE);
}
int generator_write_blockdev_dependency(