Commit dff69a9
committed
etc-merge: Implement merge
Merge added, modified, removed files from the current etc into the new
etc directory, following the rules
1. If file is removed from current_etc, it will be removed from new_etc
2. If file is modified in current_etc, it will be copied to the new_etc
overwriting any existing files
3. If a file is added in current_etc, then the above modification rule
applies
Modification includes change in content/permissions. Changed in Xattrs
and/or ownership is not handled yet.
Signed-off-by: Johan-Liebert1 <[email protected]>
etc-merge: Handle ownership changes
Signed-off-by: Johan-Liebert1 <[email protected]>
etc-merge: Handle xattrs
Signed-off-by: Johan-Liebert1 <[email protected]>
etc-merge: Ignore mtime while comparing stat
Signed-off-by: Johan-Liebert1 <[email protected]>
Remove chown test
Signed-off-by: Johan-Liebert1 <[email protected]>
etc-merge: Use `llistxattr` and `lgetxattr`
Use the non symlink following counterparts for getting xattrs. Document
public functions and structures
Signed-off-by: Johan-Liebert1 <[email protected]>1 parent b2d5fc4 commit dff69a9
3 files changed
+665
-74
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
14 | 17 | | |
15 | 18 | | |
16 | 19 | | |
0 commit comments