SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28014 from bluca/portable_fixes

Browse Source 
portabled fixes
This commit is contained in:
Lennart Poettering
2023-06-13 13:19:02 +02:00
committed by GitHub
parent 05d53d529a 7d812d7ca1
commit 39b5f49f28
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/portable/portable.c
+14 -2
View File
@@ -255,6 +255,7 @@ static int extract_now(
_cleanup_(portable_metadata_unrefp) PortableMetadata *m = NULL;
_cleanup_(mac_selinux_freep) char *con = NULL;
_cleanup_close_ int fd = -EBADF;
struct stat st;
if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY))
continue;
@@ -275,6 +276,17 @@ static int extract_now(
continue;
}
/* Reject empty files, just in case */
if (fstat(fd, &st) < 0) {
log_debug_errno(errno, "Failed to stat unit file '%s', ignoring: %m", de->d_name);
continue;
}
if (st.st_size <= 0) {
log_debug("Unit file '%s' is empty, ignoring.", de->d_name);
continue;
}
#if HAVE_SELINUX
/* The units will be copied on the host's filesystem, so if they had a SELinux label
* we have to preserve it. Copy it out so that it can be applied later. */
@@ -1130,7 +1142,7 @@ static int install_chroot_dropin(
}
}
r = write_string_file(dropin, text, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC);
r = write_string_file(dropin, text, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_SYNC);
if (r < 0)
return log_debug_errno(r, "Failed to write '%s': %m", dropin);
@@ -1177,7 +1189,7 @@ static int install_profile_dropin(
if (flags & PORTABLE_PREFER_COPY) {
r = copy_file_atomic(from, dropin, 0644, COPY_REFLINK);
r = copy_file_atomic(from, dropin, 0644, COPY_REFLINK|COPY_FSYNC);
if (r < 0)
return log_debug_errno(r, "Failed to copy %s %s %s: %m", from, special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), dropin);