From 6e5d0e319ee45c6c2588a53468e98bd1b9c62f0d Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 5 Apr 2023 16:48:27 +0800 Subject: [PATCH] edit-util: add DROPIN_MARKER_{START,END} --- src/shared/edit-util.h | 3 +++ 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 63c6190ef84..e57ca80a492 100644 --- a/src/shared/edit-util.h +++ b/src/shared/edit-util.h @@ -3,6 +3,9 @@ #include +#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 5f42dc239ff..ff16b732296 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 = {}; -- 2.47.3