From 1fb53ab1ff945fd78916943a46437dd21f02caf0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 21 Feb 2017 17:44:35 +0100 Subject: [PATCH 1/1] bootctl: create loader.conf only if it doesn't exist yet If the snippet aleady exists, don't do anything, as the file was already installed then. (This also reworks the code to create the file atomically) Fixes: #5396 --- src/basic/fs-util.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index 3f47537de..60f465a4d 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -104,3 +104,9 @@ static inline void rmdir_and_free(char *p) { free(p); } DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rmdir_and_free); + +static inline void unlink_and_free(char *p) { + (void) unlink(p); + free(p); +} +DEFINE_TRIVIAL_CLEANUP_FUNC(char*, unlink_and_free); -- 2.30.2