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'

diff --git a/src/boot/bless-boot-generator.c b/src/boot/bless-boot-generator.c
index 0fd9c76d191aba9551844fdec1214068212408fc..e28cccd761137b2b1229305eba13ad4620f90c06 100644 (file)
--- 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 4ee77de8c32a53d1be6b651e4d05463cbff60e46..15bfe9348f4e3f75d951f4cd628fe829e618d821 100644 (file)
--- 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 d90f2321a03e430316d6fd4475326de42daa4a8e..6e30aa475c518b5e51197ca322a66ce7696ef140 100644 (file)
--- 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 5098336abed2e36dd9816a9c7d6716c1f762cefa..15ac20dd713554953ef0119f7bb5f299bccb4644 100644 (file)
--- 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 801515467915e63efcf628d9179384847bbac855..e2e07bca76fa09b36671ff8db78420eb74721358 100644 (file)
--- 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 03942e94ea5182869779954141bd2b46c434a4fc..1ca071e9991686742d5a3debabc2f0f1f70f24fe 100644 (file)
--- 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 64c184558f174f3cd537bb7cf425890437d7bd0c..e225424ce233394426e810561eb9f64686eb4fd1 100644 (file)
--- 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 9135aca07e236750fe98c474fa39ddda2acf6500..a8dc68bcccadc1fe41acdb92e586edbdc5453a92 100644 (file)
--- 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 4b7d7d58cdef8aa0ec78c04507683f80c7e7347f..06062e451006360d2754ab657508c857bfe803f8 100644 (file)
--- 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 6a1badabd491c280f2e1b5fdb9057c4848bcc31a..c4acdc4a50b54601b6bd635c30ba6a6c74f72362 100644 (file)
--- 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 5eaba5d32e145ce52a7f957977840df0ab51d2fc..33d803cd0744c5f93d461da905145844b2bafc35 100644 (file)
--- 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");