shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

firstboot: fix can't overwrite timezone

Browse Source 
(cherry picked from commit e56dc320d39ade1795118ebe400308a80511e9c9)
This commit is contained in:
bin456789 2022-08-14 03:29:37 +08:00 committed by Zbigniew Jędrzejewski-Szmek
parent f279a6f4d1
commit 52c631b02e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/firstboot/firstboot.c
View File

@ -479,8 +479,9 @@ static int process_timezone(void) {
return log_error_errno(r, "Failed to read host timezone: %m");
(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);
r = symlink_atomic(p, etc_localtime);
if (r < 0)
return log_error_errno(r, "Failed to create %s symlink: %m", etc_localtime);
log_info("%s copied.", etc_localtime);
return 0;
@ -497,8 +498,9 @@ static int process_timezone(void) {
e = strjoina("../usr/share/zoneinfo/", arg_timezone);
(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);
r = symlink_atomic(e, etc_localtime);
if (r < 0)
return log_error_errno(r, "Failed to create %s symlink: %m", etc_localtime);
log_info("%s written", etc_localtime);
return 0;