generators: introduce a common implementation for the log setup boilerplate

diff --git a/src/boot/bless-boot-generator.c b/src/boot/bless-boot-generator.c
index 139f65d25c63ab35eb4197cde86da8a87c015bc0..0fd9c76d191aba9551844fdec1214068212408fc 100644 (file)
--- a/src/boot/bless-boot-generator.c
+++ b/src/boot/bless-boot-generator.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 
 #include "efivars.h"
+#include "generator.h"
 #include "log.h"
 #include "mkdir.h"
 #include "special.h"
@@ -21,10 +22,7 @@ static const char *arg_dest = "/tmp";
 int main(int argc, char *argv[]) {
         const char *p;
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 85ace5379cd9f9289ea8934ea6e2fec3df852446..4ee77de8c32a53d1be6b651e4d05463cbff60e46 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -583,10 +583,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[1];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index 73a8d3527185a2bbfd43e3cadb6cdeb0590e3670..d90f2321a03e430316d6fd4475326de42daa4a8e 100644 (file)
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
+#include "generator.h"
 #include "main-func.h"
 #include "mkdir.h"
 #include "parse-util.h"
@@ -152,10 +153,7 @@ static int run(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[2];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 482229b4a53fd3cccdce03f904de7bf43d49d69b..8225c1e86905cd0ffb8dfd4ef2ceb154f3be1f3b 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -870,10 +870,7 @@ int main(int argc, char *argv[]) {
         if (argc > 3)
                 arg_dest_late = argv[3];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 6af4c391371ee4fe095bba0f92ac4316e747aad6..801515467915e63efcf628d9179384847bbac855 100644 (file)
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -8,6 +8,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "generator.h"
 #include "log.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -120,10 +121,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[1];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index f0d06ffacf31fdf60f54dd5b6b4b528363cf69fe..03942e94ea5182869779954141bd2b46c434a4fc 100644 (file)
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -679,10 +679,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[3];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index bfee2fde313f7f84fd32190bb705553e164fbbba..fd58720779225ca13f7628807cf5e98856efe918 100644 (file)
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "fstab-util.h"
+#include "generator.h"
 #include "log.h"
 #include "mkdir.h"
 #include "proc-cmdline.h"
@@ -68,10 +69,7 @@ static int process_resume(void) {
 int main(int argc, char *argv[]) {
         int r = 0;
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index ba5e336a34f615a87cf4c9bfe4efd49396a56924..9135aca07e236750fe98c474fa39ddda2acf6500 100644 (file)
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "generator.h"
 #include "log.h"
 #include "mkdir.h"
 #include "string-util.h"
@@ -51,10 +52,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[1];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 8d4fd3267bf7e5e6676cdc1813ffc0b7fdc22248..53db27a93d38ba4a524efdea5230501aab095a8a 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -498,3 +498,10 @@ int generator_hook_up_growfs(
 
         return generator_add_symlink(dir, where_unit, "wants", unit);
 }
+
+void log_setup_generator(void) {
+        log_set_prohibit_ipc(true);
+        log_set_target(LOG_TARGET_AUTO);
+        log_parse_environment();
+        log_open();
+}

diff --git a/src/shared/generator.h b/src/shared/generator.h
index f0a493b21e9226ba2542ac3883ef8dcc509e2c0c..f1a055401a60dbd9a977584ab8af16c1847a2822 100644 (file)
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -47,3 +47,5 @@ int generator_hook_up_growfs(
         const char *dir,
         const char *where,
         const char *target);
+
+void log_setup_generator(void);

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 0f77042f48a4381b1915d5ec1dbebeb92422ad18..4b7d7d58cdef8aa0ec78c04507683f80c7e7347f 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 
 #include "fs-util.h"
+#include "generator.h"
 #include "log.h"
 #include "proc-cmdline.h"
 #include "special.h"
@@ -61,10 +62,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[2];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index c92d7f841a336e4d8ce15acdbea1027ed8e03f9b..6a1badabd491c280f2e1b5fdb9057c4848bcc31a 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -924,10 +924,7 @@ static int run(int argc, char *argv[]) {
         Iterator j;
         int r;
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         if (argc > 1 && argc != 4) {
                 log_error("This program takes three or no arguments.");

diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 0c63c5eaada7178620d12dd98001e50285e95f7a..b64d01555919935d8ef72698ff234cfc37af2bd2 100644 (file)
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -210,10 +210,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[1];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);