morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

generators: introduce a common implementation for the log setup boilerplate

Browse Source
This commit is contained in:
Lennart Poettering
2018-11-19 21:32:11 +01:00
parent 4874191d9d
commit afe44c8ffd
13 changed files with 26 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/boot/bless-boot-generator.c
View File

@@ -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);

5
src/cryptsetup/cryptsetup-generator.c
View File

@@ -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);

6
src/debug-generator/debug-generator.c
View File

@@ -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);

5
src/fstab-generator/fstab-generator.c
View File

@@ -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);

6
src/getty-generator/getty-generator.c
View File

@@ -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);

5
src/gpt-auto-generator/gpt-auto-generator.c
View File

@@ -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);

6
src/hibernate-resume/hibernate-resume-generator.c
View File

@@ -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);

6
src/rc-local-generator/rc-local-generator.c
View File

@@ -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);

7
src/shared/generator.c
View File

@@ -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();
}

2
src/shared/generator.h
View File

@@ -47,3 +47,5 @@ int generator_hook_up_growfs(
const char *dir,
const char *where,
const char *target);
void log_setup_generator(void);

6
src/system-update-generator/system-update-generator.c
View File

@@ -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);

5
src/sysv-generator/sysv-generator.c
View File

@@ -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.");

5
src/veritysetup/veritysetup-generator.c
View File

@@ -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);