X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Ffirstboot%2Ffirstboot.c;h=e6b40294bf6df17883eb6867c4a767e363136d11;hb=127c167cdbbce1c3d730cd53fd79ef5a0603ab7d;hp=7d97777b0dcef9efbc675a3c70fee1d342f7a071;hpb=365939fc9f52686359d56f324939498e830932ce;p=thirdparty%2Fsystemd.git

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 7d97777b0dc..e6b40294bf6 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -253,7 +253,7 @@ static int process_locale(void) {
 
         if (arg_copy_locale && arg_root) {
 
-                mkdir_parents(etc_localeconf, 0755);
+                (void) mkdir_parents(etc_localeconf, 0755);
                 r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644, 0, 0, COPY_REFLINK);
                 if (r != -ENOENT) {
                         if (r < 0)
@@ -278,7 +278,7 @@ static int process_locale(void) {
 
         locales[i] = NULL;
 
-        mkdir_parents(etc_localeconf, 0755);
+        (void) mkdir_parents(etc_localeconf, 0755);
         r = write_env_file(etc_localeconf, locales);
         if (r < 0)
                 return log_error_errno(r, "Failed to write %s: %m", etc_localeconf);
@@ -327,7 +327,7 @@ static int process_keymap(void) {
 
         if (arg_copy_keymap && arg_root) {
 
-                mkdir_parents(etc_vconsoleconf, 0755);
+                (void) mkdir_parents(etc_vconsoleconf, 0755);
                 r = copy_file("/etc/vconsole.conf", etc_vconsoleconf, 0, 0644, 0, 0, COPY_REFLINK);
                 if (r != -ENOENT) {
                         if (r < 0)
@@ -411,7 +411,7 @@ static int process_timezone(void) {
                         if (r < 0)
                                 return log_error_errno(r, "Failed to read host timezone: %m");
 
-                        mkdir_parents(etc_localtime, 0755);
+                        (void) mkdir_parents(etc_localtime, 0755);
                         if (symlink(p, etc_localtime) < 0)
                                 return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime);
 
@@ -429,7 +429,7 @@ static int process_timezone(void) {
 
         e = strjoina("../usr/share/zoneinfo/", arg_timezone);
 
-        mkdir_parents(etc_localtime, 0755);
+        (void) mkdir_parents(etc_localtime, 0755);
         if (symlink(e, etc_localtime) < 0)
                 return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime);
 
@@ -490,9 +490,8 @@ static int process_hostname(void) {
         if (isempty(arg_hostname))
                 return 0;
 
-        mkdir_parents(etc_hostname, 0755);
         r = write_string_file(etc_hostname, arg_hostname,
-                              WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC);
+                              WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC | WRITE_STRING_FILE_MKDIR_0755);
         if (r < 0)
                 return log_error_errno(r, "Failed to write %s: %m", etc_hostname);
 
@@ -512,9 +511,8 @@ static int process_machine_id(void) {
         if (sd_id128_is_null(arg_machine_id))
                 return 0;
 
-        mkdir_parents(etc_machine_id, 0755);
         r = write_string_file(etc_machine_id, sd_id128_to_string(arg_machine_id, id),
-                              WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC);
+                              WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC | WRITE_STRING_FILE_MKDIR_0755);
         if (r < 0)
                 return log_error_errno(r, "Failed to write machine id: %m");
 
@@ -615,7 +613,7 @@ static int process_root_password(void) {
         if (laccess(etc_shadow, F_OK) >= 0)
                 return 0;
 
-        mkdir_parents(etc_shadow, 0755);
+        (void) mkdir_parents(etc_shadow, 0755);
 
         lock = take_etc_passwd_lock(arg_root);
         if (lock < 0)