tree-wide: use WRITE_STRING_FILE_MKDIR_0755 at more places

3 files changed, 10 insertions, 20 deletions

diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index ee7bbd1002..ea9898e104 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -31,8 +31,7 @@ static void setup_test_dir(char *tmp_dir, const char *files, ...) {
                 _cleanup_free_ char *path;
 
                 assert_se(path = path_join(tmp_dir, files));
-                (void) mkdir_parents(path, 0755);
-                assert_se(write_string_file(path, "foobar", WRITE_STRING_FILE_CREATE) >= 0);
+                assert_se(write_string_file(path, "foobar", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
                 files = va_arg(ap, const char *);
         }
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 445a4b2a6e..0e4b194e2d 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -103,8 +103,7 @@ static void test_copy_tree(void) {
 
                 assert_se(f = path_join(original_dir, *p));
 
-                assert_se(mkdir_parents(f, 0755) >= 0);
-                assert_se(write_string_file(f, "file", WRITE_STRING_FILE_CREATE) == 0);
+                assert_se(write_string_file(f, "file", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) == 0);
 
                 assert_se(base64mem(*p, strlen(*p), &c) >= 0);
 
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index ddba5e4dff..d0bd6917a8 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -710,8 +710,7 @@ static void test_revert(const char *root) {
         changes = NULL; n_changes = 0;
 
         p = strjoina(root, SYSTEM_CONFIG_UNIT_DIR"/xx.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
-        assert_se(write_string_file(p, "# Empty dropin\n", WRITE_STRING_FILE_CREATE) >= 0);
+        assert_se(write_string_file(p, "# Empty dropin\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         /* Revert the dropin file */
         assert_se(unit_file_revert(UNIT_FILE_SYSTEM, root, STRV_MAKE("xx.service"), &changes, &n_changes) >= 0);
@@ -813,10 +812,9 @@ static void test_with_dropin(const char *root) {
                                     "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0);
 
         p = strjoina(root, "/usr/lib/systemd/system/with-dropin-1.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
         assert_se(write_string_file(p,
                                     "[Install]\n"
-                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE) >= 0);
+                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "with-dropin-1.service", &state) >= 0 && state == UNIT_FILE_DISABLED);
 
@@ -826,10 +824,9 @@ static void test_with_dropin(const char *root) {
                                     "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0);
 
         p = strjoina(root, "/usr/lib/systemd/system/with-dropin-2.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
         assert_se(write_string_file(p,
                                     "[Install]\n"
-                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE) >= 0);
+                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "with-dropin-2.service", &state) >= 0 && state == UNIT_FILE_DISABLED);
 
@@ -839,10 +836,9 @@ static void test_with_dropin(const char *root) {
                                     "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0);
 
         p = strjoina(root, SYSTEM_CONFIG_UNIT_DIR"/with-dropin-3.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
         assert_se(write_string_file(p,
                                     "[Install]\n"
-                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE) >= 0);
+                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "with-dropin-3.service", &state) >= 0 && state == UNIT_FILE_DISABLED);
 
@@ -852,10 +848,9 @@ static void test_with_dropin(const char *root) {
                                     "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0);
 
         p = strjoina(root, SYSTEM_CONFIG_UNIT_DIR"/with-dropin-4a.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
         assert_se(write_string_file(p,
                                     "[Install]\n"
-                                    "Also=with-dropin-4b.service\n", WRITE_STRING_FILE_CREATE) >= 0);
+                                    "Also=with-dropin-4b.service\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "with-dropin-4a.service", &state) >= 0 && state == UNIT_FILE_DISABLED);
 
@@ -944,10 +939,9 @@ static void test_with_dropin_template(const char *root) {
                                     "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0);
 
         p = strjoina(root, "/usr/lib/systemd/system/with-dropin-1@.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
         assert_se(write_string_file(p,
                                     "[Install]\n"
-                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE) >= 0);
+                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "with-dropin-1@.service", &state) >= 0 && state == UNIT_FILE_DISABLED);
 
@@ -957,10 +951,9 @@ static void test_with_dropin_template(const char *root) {
                                     "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0);
 
         p = strjoina(root, "/usr/lib/systemd/system/with-dropin-2@instance-1.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
         assert_se(write_string_file(p,
                                     "[Install]\n"
-                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE) >= 0);
+                                    "WantedBy=graphical.target\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "with-dropin-2@.service", &state) >= 0 && state == UNIT_FILE_DISABLED);
 
@@ -971,10 +964,9 @@ static void test_with_dropin_template(const char *root) {
                                     "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0);
 
         p = strjoina(root, "/usr/lib/systemd/system/with-dropin-3@.service.d/dropin.conf");
-        assert_se(mkdir_parents(p, 0755) >= 0);
         assert_se(write_string_file(p,
                                     "[Install]\n"
-                                    "DefaultInstance=instance-2\n", WRITE_STRING_FILE_CREATE) >= 0);
+                                    "DefaultInstance=instance-2\n", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) >= 0);
 
         assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "with-dropin-3@.service", &state) >= 0 && state == UNIT_FILE_DISABLED);