summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-21 10:12:00 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-21 13:40:24 +0100
commit053254e3cb215df3b8c905bc39b920f8817e1c7d (patch)
tree02673186233fa79938f75b78a16245c593d3e29b
parentaa1f95d2647197eca84c33a0f10adaeada08467d (diff)
downloadsystemd-053254e3cb215df3b8c905bc39b920f8817e1c7d.tar.gz
generators: drop umask calls
systemd already sets the umask (see e3b8d0637dd755b3426f3363b2cdad63f738116c). When running under systemd, we don't need to set it. And when *not* running under systemd, for example during development, there is no reason to override the user config. Let's just drop those calls. $ git grep -e 'umask\(' -l 'src/*generator*' |xargs perl -i -0pe 's|^[^\n]*umask\([^\n]+\n\n||gms'
-rw-r--r--src/boot/bless-boot-generator.c2
-rw-r--r--src/cryptsetup/cryptsetup-generator.c2
-rw-r--r--src/debug-generator/debug-generator.c2
-rw-r--r--src/fstab-generator/fstab-generator.c2
-rw-r--r--src/getty-generator/getty-generator.c2
-rw-r--r--src/gpt-auto-generator/gpt-auto-generator.c2
-rw-r--r--src/hibernate-resume/hibernate-resume-generator.c2
-rw-r--r--src/rc-local-generator/rc-local-generator.c2
-rw-r--r--src/system-update-generator/system-update-generator.c2
-rw-r--r--src/sysv-generator/sysv-generator.c2
-rw-r--r--src/veritysetup/veritysetup-generator.c2
11 files changed, 0 insertions, 22 deletions
diff --git a/src/boot/bless-boot-generator.c b/src/boot/bless-boot-generator.c
index 0fd9c76d19..e28cccd761 100644
--- a/src/boot/bless-boot-generator.c
+++ b/src/boot/bless-boot-generator.c
@@ -24,8 +24,6 @@ int main(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
return EXIT_FAILURE;
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 4ee77de8c3..15bfe9348f 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -585,8 +585,6 @@ int main(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
arg_disks = hashmap_new(&string_hash_ops);
if (!arg_disks) {
r = log_oom();
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index d90f2321a0..6e30aa475c 100644
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -155,8 +155,6 @@ static int run(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
r = proc_cmdline_parse(parse_proc_cmdline_item, NULL, PROC_CMDLINE_RD_STRICT | PROC_CMDLINE_STRIP_RD_PREFIX);
if (r < 0)
log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 5098336abe..15ac20dd71 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -882,8 +882,6 @@ static int run(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
r = proc_cmdline_parse(parse_proc_cmdline_item, NULL, 0);
if (r < 0)
log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 8015154679..e2e07bca76 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -123,8 +123,6 @@ int main(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
if (detect_container() > 0) {
_cleanup_free_ char *container_ttys = NULL;
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 03942e94ea..1ca071e999 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -681,8 +681,6 @@ int main(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
if (detect_container() > 0) {
log_debug("In a container, exiting.");
return EXIT_SUCCESS;
diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index 64c184558f..e225424ce2 100644
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -74,8 +74,6 @@ static int run(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
return -EINVAL;
diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index 9135aca07e..a8dc68bccc 100644
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -54,8 +54,6 @@ int main(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
if (access(RC_LOCAL_SCRIPT_PATH_START, X_OK) >= 0) {
log_debug("Automatically adding rc-local.service.");
diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 4b7d7d58cd..06062e4510 100644
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -64,8 +64,6 @@ int main(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
r = generate_symlink();
if (r > 0) {
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 6a1badabd4..c4acdc4a50 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -934,8 +934,6 @@ static int run(int argc, char *argv[]) {
if (argc > 1)
arg_dest = argv[3];
- umask(0022);
-
r = lookup_paths_init(&lp, UNIT_FILE_SYSTEM, LOOKUP_PATHS_EXCLUDE_GENERATED, NULL);
if (r < 0)
return log_error_errno(r, "Failed to find lookup paths: %m");
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c
index 5eaba5d32e..33d803cd07 100644
--- a/src/veritysetup/veritysetup-generator.c
+++ b/src/veritysetup/veritysetup-generator.c
@@ -212,8 +212,6 @@ int main(int argc, char *argv[]) {
log_setup_generator();
- umask(0022);
-
r = proc_cmdline_parse(parse_proc_cmdline_item, NULL, PROC_CMDLINE_STRIP_RD_PREFIX);
if (r < 0) {
log_warning_errno(r, "Failed to parse kernel command line: %m");