summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorMike Yuan <me@yhndnzj.com>2023-04-07 01:41:24 +0800
committerMike Yuan <me@yhndnzj.com>2023-04-07 16:13:00 +0800
commitbc6c7a58c25f9e974996d43473fbfb1273d746c0 (patch)
tree2646bf79a8f04707d9d358e858b2a4eb2994c428 /src/machine
parent54ad6aa164042a7e4c49abf59ad1d728c1bb6d0b (diff)
downloadsystemd-bc6c7a58c25f9e974996d43473fbfb1273d746c0.tar.gz
edit-util: introduce overwrite_with_origin switch
Before this commit, if `original_path` is given, it will always be used to overwrite `path`. After this commit, it's controlled by the newly-added switch `overwrite_with_origin`.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machinectl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 6a29a32bcd..7eb2235667 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1454,9 +1454,7 @@ static int get_settings_path(const char *name, char **ret_path) {
}
static int edit_settings(int argc, char *argv[], void *userdata) {
- _cleanup_(edit_file_context_done) EditFileContext context = {
- .remove_parent = false,
- };
+ _cleanup_(edit_file_context_done) EditFileContext context = {};
int r;
if (!on_tty())