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

tmpfiles: add specifier expansion for L and C lines, too

Browse source
This commit is contained in:
Lennart Poettering 2015-04-10 18:07:04 +02:00
parent b1b5922e2f
commit 5c5ccf12b6
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/tmpfiles/tmpfiles.c
View file

@ -1105,17 +1105,23 @@ static int create_item(Item *i) {
return r; return r;
break; break;
case COPY_FILES: case COPY_FILES: {
log_debug("Copying tree \"%s\" to \"%s\".", i->argument, i->path); _cleanup_free_ char *resolved = NULL;
r = copy_tree(i->argument, i->path, false);
r = specifier_printf(i->argument, specifier_table, NULL, &resolved);
if (r < 0)
return log_error_errno(r, "Failed to substitute specifiers in copy source %s: %m", i->argument);
log_debug("Copying tree \"%s\" to \"%s\".", resolved, i->path);
r = copy_tree(resolved, i->path, false);
if (r < 0) { if (r < 0) {
struct stat a, b; struct stat a, b;
if (r != -EEXIST) if (r != -EEXIST)
return log_error_errno(r, "Failed to copy files to %s: %m", i->path); return log_error_errno(r, "Failed to copy files to %s: %m", i->path);
if (stat(i->argument, &a) < 0) if (stat(resolved, &a) < 0)
return log_error_errno(errno, "stat(%s) failed: %m", i->argument); return log_error_errno(errno, "stat(%s) failed: %m", resolved);
if (stat(i->path, &b) < 0) if (stat(i->path, &b) < 0)
return log_error_errno(errno, "stat(%s) failed: %m", i->path); return log_error_errno(errno, "stat(%s) failed: %m", i->path);
@ -1224,29 +1230,35 @@ static int create_item(Item *i) {
return r; return r;
break; break;
}
case CREATE_SYMLINK: case CREATE_SYMLINK: {
_cleanup_free_ char *resolved = NULL;
r = specifier_printf(i->argument, specifier_table, NULL, &resolved);
if (r < 0)
return log_error_errno(r, "Failed to substitute specifiers in symlink target %s: %m", i->argument);
mac_selinux_create_file_prepare(i->path, S_IFLNK); mac_selinux_create_file_prepare(i->path, S_IFLNK);
r = symlink(i->argument, i->path); r = symlink(resolved, i->path);
mac_selinux_create_file_clear(); mac_selinux_create_file_clear();
if (r < 0) { if (r < 0) {
_cleanup_free_ char *x = NULL; _cleanup_free_ char *x = NULL;
if (errno != EEXIST) if (errno != EEXIST)
return log_error_errno(errno, "symlink(%s, %s) failed: %m", i->argument, i->path); return log_error_errno(errno, "symlink(%s, %s) failed: %m", resolved, i->path);
r = readlink_malloc(i->path, &x); r = readlink_malloc(i->path, &x);
if (r < 0 || !streq(i->argument, x)) { if (r < 0 || !streq(resolved, x)) {
if (i->force) { if (i->force) {
mac_selinux_create_file_prepare(i->path, S_IFLNK); mac_selinux_create_file_prepare(i->path, S_IFLNK);
r = symlink_atomic(i->argument, i->path); r = symlink_atomic(resolved, i->path);
mac_selinux_create_file_clear(); mac_selinux_create_file_clear();
if (r < 0) if (r < 0)
return log_error_errno(r, "symlink(%s, %s) failed: %m", i->argument, i->path); return log_error_errno(r, "symlink(%s, %s) failed: %m", resolved, i->path);
creation = CREATION_FORCE; creation = CREATION_FORCE;
} else { } else {
log_debug("\"%s\" is not a symlink or does not point to the correct path.", i->path); log_debug("\"%s\" is not a symlink or does not point to the correct path.", i->path);
@ -1259,6 +1271,7 @@ static int create_item(Item *i) {
log_debug("%s symlink \"%s\".", creation_mode_verb_to_string(creation), i->path); log_debug("%s symlink \"%s\".", creation_mode_verb_to_string(creation), i->path);
break; break;
}
case CREATE_BLOCK_DEVICE: case CREATE_BLOCK_DEVICE:
case CREATE_CHAR_DEVICE: { case CREATE_CHAR_DEVICE: {