keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

postprocess: always nuke /var/run

Browse Source 
If `/var/run` exists, it will be a dir, so we'll fail the `unlinkat`
with `EISDIR`. Let's just explicitly nuke it.

Closes: #831
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-06-15 13:35:36 -04:00 committed by Atomic Bot
parent 943138b132
commit 57cf8d9bc0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libpriv/rpmostree-postprocess.c
View File

@ -329,7 +329,6 @@ convert_var_to_tmpfiles_d (int src_rootfs_dfd,
* runtime. (And really both in CentOS and Fedora)
*/
const char *known_state_files[] = {
"run", /* We never want to traverse into /run when making tmpfiles since it's a tmpfs */
"lib/systemd/random-seed", /* https://bugzilla.redhat.com/show_bug.cgi?id=789407 */
"lib/systemd/catalog/database",
"lib/plymouth/boot-duration",
@ -340,6 +339,10 @@ convert_var_to_tmpfiles_d (int src_rootfs_dfd,
if (!glnx_opendirat (src_rootfs_dfd, "var", TRUE, &var_dfd, error))
return FALSE;
/* We never want to traverse into /run when making tmpfiles since it's a tmpfs */
if (!glnx_shutil_rm_rf_at (var_dfd, "run", cancellable, error))
return FALSE;
/* Here, delete some files ahead of time to avoid emitting warnings
* for things that are known to be harmless.
*/
@ -349,7 +352,7 @@ convert_var_to_tmpfiles_d (int src_rootfs_dfd,
if (unlinkat (var_dfd, path, 0) < 0)
{
if (errno != ENOENT)
return glnx_throw_errno_prefix (error, "unlinkat");
return glnx_throw_errno_prefix (error, "unlinkat(%s)", path);
}
}