deploy: Ignore sockets, fifos in /etc during merge
https://bugzilla.redhat.com/show_bug.cgi?id=1945274 is an issue where a privileged kubernetes daemonset is writing a socket into `/etc`. This makes ostree upgrades barf. Now, they should clearly move it to `/run`. However, one option is for us to just ignore it instead of erroring out. Some brief investigation shows that e.g. `git add somesocket` is a silent no-op, which is an argument in favor of ignoring it. Closes: https://github.com/ostreedev/ostree/issues/2446
This commit is contained in:
1 parent
5bf4b1dabc
commit
e6a560b407
3 files changed
+28
-3
No files matched your search
@@ -488,9 +488,7 @@ copy_modified_config_file (int orig_etc_fd,
|
||||
}
|
||||
else
|
||||
{
|
||||
return glnx_throw (error,
|
||||
"Unsupported non-regular/non-symlink file in /etc '%s'",
|
||||
path);
|
||||
ot_journal_print (LOG_INFO, "Ignoring non-regular/non-symlink file found during /etc merge: %s", path);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
Reference in new issue
Block a user