summaryrefslogtreecommitdiff
path: root/src/veritysetup
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-20 13:36:45 +0100
committerGitHub <noreply@github.com>2018-11-20 13:36:45 +0100
commit7fa0269bcaf1e1f7060b2c393b3e71b501f4296f (patch)
treead3136cebc19d2fac3c407aad4cadbfb95b9305a /src/veritysetup
parentad0cdb6b6768a7b8b8d6de32a9c1837b4b7773b0 (diff)
parent6bf3c61c57f1ba439b2124fb89229395a77f8f46 (diff)
downloadsystemd-7fa0269bcaf1e1f7060b2c393b3e71b501f4296f.tar.gz
Merge pull request #10850 from poettering/log-setup
reduce some logging boilerplate
Diffstat (limited to 'src/veritysetup')
-rw-r--r--src/veritysetup/veritysetup-generator.c5
-rw-r--r--src/veritysetup/veritysetup.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index ebb688e68e..5eaba5d32e 100644
--- 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);
diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 61dcfd7cc2..a10baf2bfd 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -50,9 +50,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- log_set_target(LOG_TARGET_AUTO);
- log_parse_environment();
- log_open();
+ log_setup_service();
umask(0022);