diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-12-16 15:55:27 -0500 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-12-17 17:26:59 -0500 |
commit | 075dafd2045728fef61a99e876400781ab5bb373 (patch) | |
tree | bb3ede972e152ffbfdec21b2b5385a8b5722f459 | |
parent | c73838280cb107a10e0d8d45227d5471db56368f (diff) |
Use SPECIAL_DEFAULT_TARGET consistently
-rw-r--r-- | src/system-update-generator/system-update-generator.c | 6 | ||||
-rw-r--r-- | src/test/test-install-root.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index a3d677f068..6ffb169b21 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/system-update-generator/system-update-generator.c @@ -22,12 +22,12 @@ #include "fs-util.h" #include "log.h" +#include "special.h" #include "string-util.h" #include "util.h" /* - * Implements the logic described in - * http://freedesktop.org/wiki/Software/systemd/SystemUpdates + * Implements the logic described in systemd.offline-updates(7). */ static const char *arg_dest = "/tmp"; @@ -43,7 +43,7 @@ static int generate_symlink(void) { return -EINVAL; } - p = strjoina(arg_dest, "/default.target"); + p = strjoina(arg_dest, "/" SPECIAL_DEFAULT_TARGET); if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) return log_error_errno(errno, "Failed to create symlink %s: %m", p); diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index a98de76b43..d0bc8004f3 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -22,6 +22,7 @@ #include "install.h" #include "mkdir.h" #include "rm-rf.h" +#include "special.h" #include "string-util.h" static void test_basic_mask_and_enable(const char *root) { @@ -338,7 +339,7 @@ static void test_default(const char *root) { assert_se(n_changes == 1); assert_se(changes[0].type == UNIT_FILE_SYMLINK); assert_se(streq(changes[0].source, "/usr/lib/systemd/system/test-default-real.target")); - p = strjoina(root, SYSTEM_CONFIG_UNIT_PATH"/default.target"); + p = strjoina(root, SYSTEM_CONFIG_UNIT_PATH "/" SPECIAL_DEFAULT_TARGET); assert_se(streq(changes[0].path, p)); unit_file_changes_free(changes, n_changes); changes = NULL; n_changes = 0; |