picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use SPECIAL_DEFAULT_TARGET consistently

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-12-16 15:55:27 -05:00
parent c73838280c
commit 075dafd204
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/system-update-generator/system-update-generator.c
View file

@ -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);

3
src/test/test-install-root.c
View file

@ -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;