diff options
author | Mike Yuan <me@yhndnzj.com> | 2023-04-05 16:48:27 +0800 |
---|---|---|
committer | Mike Yuan <me@yhndnzj.com> | 2023-04-07 16:10:54 +0800 |
commit | 6e5d0e319ee45c6c2588a53468e98bd1b9c62f0d (patch) | |
tree | 88d31da699fe4192ce4a9649840e5f065ca7eb83 | |
parent | e144a26306dbe07fe37f294301421a938b781247 (diff) | |
download | systemd-6e5d0e319ee45c6c2588a53468e98bd1b9c62f0d.tar.gz |
edit-util: add DROPIN_MARKER_{START,END}
-rw-r--r-- | src/shared/edit-util.h | 3 | ||||
-rw-r--r-- | src/systemctl/systemctl-edit.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/edit-util.h b/src/shared/edit-util.h index 63c6190ef8..e57ca80a49 100644 --- a/src/shared/edit-util.h +++ b/src/shared/edit-util.h @@ -3,6 +3,9 @@ #include <stdbool.h> +#define DROPIN_MARKER_START "### Anything between here and the comment below will become the contents of the drop-in file" +#define DROPIN_MARKER_END "### Edits below this comment will be discarded" + typedef struct EditFile EditFile; typedef struct EditFileContext EditFileContext; diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c index 5f42dc239f..ff16b73229 100644 --- a/src/systemctl/systemctl-edit.c +++ b/src/systemctl/systemctl-edit.c @@ -13,9 +13,6 @@ #include "systemctl.h" #include "terminal-util.h" -#define EDIT_MARKER_START "### Anything between here and the comment below will become the contents of the drop-in file" -#define EDIT_MARKER_END "### Edits below this comment will be discarded" - int verb_cat(int argc, char *argv[], void *userdata) { _cleanup_(hashmap_freep) Hashmap *cached_name_map = NULL, *cached_id_map = NULL; _cleanup_(lookup_paths_free) LookupPaths lp = {}; @@ -316,8 +313,8 @@ static int find_paths_to_edit( int verb_edit(int argc, char *argv[], void *userdata) { _cleanup_(edit_file_context_done) EditFileContext context = { - .marker_start = EDIT_MARKER_START, - .marker_end = EDIT_MARKER_END, + .marker_start = DROPIN_MARKER_START, + .marker_end = DROPIN_MARKER_END, .remove_parent = !arg_full, }; _cleanup_(lookup_paths_free) LookupPaths lp = {}; |