summaryrefslogtreecommitdiff
path: root/src/firstboot
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:23:20 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:24:30 +0100
commit23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41 (patch)
tree28e66fb86dd0cffc3a3cca3cf234cb52c3b64ad3 /src/firstboot
parent5e03c6e3b517286bbd65b48d88f60e5b83721894 (diff)
treewide: more log_*_errno + return simplifications
Diffstat (limited to 'src/firstboot')
-rw-r--r--src/firstboot/firstboot.c90
1 files changed, 30 insertions, 60 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index ac90bc2631..343f3e100e 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -166,10 +166,8 @@ static int prompt_loop(const char *text, char **l, bool (*is_valid)(const char *
unsigned u;
r = ask_string(&p, "%s %s (empty to skip): ", draw_special_char(DRAW_TRIANGULAR_BULLET), text);
- if (r < 0) {
- log_error_errno(r, "Failed to query user: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to query user: %m");
if (isempty(p)) {
log_warning("No data entered, skipping.");
@@ -219,10 +217,8 @@ static int prompt_locale(void) {
return 0;
r = get_locales(&locales);
- if (r < 0) {
- log_error_errno(r, "Cannot query locales list: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot query locales list: %m");
print_welcome();
@@ -262,10 +258,8 @@ static int process_locale(void) {
mkdir_parents(etc_localeconf, 0755);
r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644);
if (r != -ENOENT) {
- if (r < 0) {
- log_error_errno(r, "Failed to copy %s: %m", etc_localeconf);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to copy %s: %m", etc_localeconf);
log_info("%s copied.", etc_localeconf);
return 0;
@@ -288,10 +282,8 @@ static int process_locale(void) {
mkdir_parents(etc_localeconf, 0755);
r = write_env_file(etc_localeconf, locales);
- if (r < 0) {
- log_error_errno(r, "Failed to write %s: %m", etc_localeconf);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write %s: %m", etc_localeconf);
log_info("%s written.", etc_localeconf);
return 0;
@@ -308,10 +300,8 @@ static int prompt_timezone(void) {
return 0;
r = get_timezones(&zones);
- if (r < 0) {
- log_error_errno(r, "Cannot query timezone list: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Cannot query timezone list: %m");
print_welcome();
@@ -342,10 +332,8 @@ static int process_timezone(void) {
r = readlink_malloc("/etc/localtime", &p);
if (r != -ENOENT) {
- if (r < 0) {
- log_error_errno(r, "Failed to read host timezone: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to read host timezone: %m");
mkdir_parents(etc_localtime, 0755);
if (symlink(p, etc_localtime) < 0) {
@@ -393,10 +381,8 @@ static int prompt_hostname(void) {
_cleanup_free_ char *h = NULL;
r = ask_string(&h, "%s Please enter hostname for new system (empty to skip): ", draw_special_char(DRAW_TRIANGULAR_BULLET));
- if (r < 0) {
- log_error_errno(r, "Failed to query hostname: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to query hostname: %m");
if (isempty(h)) {
log_warning("No hostname entered, skipping.");
@@ -433,10 +419,8 @@ static int process_hostname(void) {
mkdir_parents(etc_hostname, 0755);
r = write_string_file(etc_hostname, arg_hostname);
- if (r < 0) {
- log_error_errno(r, "Failed to write %s: %m", etc_hostname);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write %s: %m", etc_hostname);
log_info("%s written.", etc_hostname);
return 0;
@@ -456,10 +440,8 @@ static int process_machine_id(void) {
mkdir_parents(etc_machine_id, 0755);
r = write_string_file(etc_machine_id, sd_id128_to_string(arg_machine_id, id));
- if (r < 0) {
- log_error_errno(r, "Failed to write machine id: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write machine id: %m");
log_info("%s written.", etc_machine_id);
return 0;
@@ -489,10 +471,8 @@ static int prompt_root_password(void) {
_cleanup_free_ char *a = NULL, *b = NULL;
r = ask_password_tty(msg1, 0, false, NULL, &a);
- if (r < 0) {
- log_error_errno(r, "Failed to query root password: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to query root password: %m");
if (isempty(a)) {
log_warning("No password entered, skipping.");
@@ -591,10 +571,8 @@ static int process_root_password(void) {
}
r = write_root_shadow(etc_shadow, p);
- if (r < 0) {
- log_error_errno(r, "Failed to write %s: %m", etc_shadow);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write %s: %m", etc_shadow);
log_info("%s copied.", etc_shadow);
return 0;
@@ -609,10 +587,8 @@ static int process_root_password(void) {
return 0;
r = dev_urandom(raw, 16);
- if (r < 0) {
- log_error_errno(r, "Failed to get salt: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get salt: %m");
/* We only bother with SHA512 hashed passwords, the rest is legacy, and we don't do legacy. */
assert_cc(sizeof(table) == 64 + 1);
@@ -635,10 +611,8 @@ static int process_root_password(void) {
item.sp_lstchg = (long) (now(CLOCK_REALTIME) / USEC_PER_DAY);
r = write_root_shadow(etc_shadow, &item);
- if (r < 0) {
- log_error_errno(r, "Failed to write %s: %m", etc_shadow);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write %s: %m", etc_shadow);
log_info("%s written.", etc_shadow);
return 0;
@@ -803,10 +777,8 @@ static int parse_argv(int argc, char *argv[]) {
arg_root_password = NULL;
r = read_one_line_file(optarg, &arg_root_password);
- if (r < 0) {
- log_error_errno(r, "Failed to read %s: %m", optarg);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to read %s: %m", optarg);
break;
@@ -870,10 +842,8 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_SETUP_MACHINE_ID:
r = sd_id128_randomize(&arg_machine_id);
- if (r < 0) {
- log_error_errno(r, "Failed to generate randomized machine ID: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to generate randomized machine ID: %m");
break;