chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysv-generator: properly add Makefile symlink
[elogind.git]
/
src
/
firstboot
/
firstboot.c
diff --git
a/src/firstboot/firstboot.c
b/src/firstboot/firstboot.c
index 343f3e100e5f06f3827966d0e7ff05bb9e007f09..d087ef35e913d4ed0ee62bc7f796e1c0729958fc 100644
(file)
--- a/
src/firstboot/firstboot.c
+++ b/
src/firstboot/firstboot.c
@@
-336,10
+336,8
@@
static int process_timezone(void) {
return log_error_errno(r, "Failed to read host timezone: %m");
mkdir_parents(etc_localtime, 0755);
return log_error_errno(r, "Failed to read host timezone: %m");
mkdir_parents(etc_localtime, 0755);
- if (symlink(p, etc_localtime) < 0) {
- log_error("Failed to create %s symlink: %m", etc_localtime);
- return -errno;
- }
+ if (symlink(p, etc_localtime) < 0)
+ return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime);
log_info("%s copied.", etc_localtime);
return 0;
log_info("%s copied.", etc_localtime);
return 0;
@@
-356,10
+354,8
@@
static int process_timezone(void) {
e = strappenda("../usr/share/zoneinfo/", arg_timezone);
mkdir_parents(etc_localtime, 0755);
e = strappenda("../usr/share/zoneinfo/", arg_timezone);
mkdir_parents(etc_localtime, 0755);
- if (symlink(e, etc_localtime) < 0) {
- log_error("Failed to create %s symlink: %m", etc_localtime);
- return -errno;
- }
+ if (symlink(e, etc_localtime) < 0)
+ return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime);
log_info("%s written", etc_localtime);
return 0;
log_info("%s written", etc_localtime);
return 0;
@@
-566,7
+562,7
@@
static int process_root_password(void) {
if (!errno)
errno = EIO;
if (!errno)
errno = EIO;
- log_error
(
"Failed to find shadow entry for root: %m");
+ log_error
_errno(errno,
"Failed to find shadow entry for root: %m");
return -errno;
}
return -errno;
}
@@
-604,7
+600,7
@@
static int process_root_password(void) {
if (!errno)
errno = -EINVAL;
if (!errno)
errno = -EINVAL;
- log_error
(
"Failed to encrypt password: %m");
+ log_error
_errno(errno,
"Failed to encrypt password: %m");
return -errno;
}
return -errno;
}