X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffirstboot%2Ffirstboot.c;h=a765d6d219d2694be6ae45f3afd454e519ea6b36;hb=ce06fdfb3de7a6591041828361f8d10c04a4677e;hp=6abffc528f953173fe658aeec37b52e359774b19;hpb=45035609fcfc3fe09324988c4929a3c147171c23;p=elogind.git diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 6abffc528..a765d6d21 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -50,7 +50,7 @@ static bool arg_copy_locale = false; static bool arg_copy_timezone = false; static bool arg_copy_root_password = false; -#define prefix_roota(p) (arg_root ? (const char*) strappenda(arg_root, p) : (const char*) p) +#define prefix_roota(p) (arg_root ? (const char*) strjoina(arg_root, p) : (const char*) p) static void clear_string(char *x) { @@ -68,7 +68,7 @@ static bool press_any_key(void) { printf("-- Press any key to proceed --"); fflush(stdout); - read_one_char(stdin, &k, (usec_t) -1, &need_nl); + (void) read_one_char(stdin, &k, USEC_INFINITY, &need_nl); if (need_nl) putchar('\n'); @@ -98,7 +98,7 @@ static void print_welcome(void) { } if (r < 0 && r != -ENOENT) - log_warning("Failed to read os-release file: %s", strerror(-r)); + log_warning_errno(r, "Failed to read os-release file: %m"); printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n", isempty(pretty_name) ? "Linux" : pretty_name); @@ -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("Failed to query user: %s", strerror(-r)); - 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("Cannot query locales list: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Cannot query locales list: %m"); print_welcome(); @@ -260,12 +256,10 @@ static int process_locale(void) { if (arg_copy_locale && arg_root) { mkdir_parents(etc_localeconf, 0755); - r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644); + r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644, 0); if (r != -ENOENT) { - if (r < 0) { - log_error("Failed to copy %s: %s", etc_localeconf, strerror(-r)); - 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; @@ -277,9 +271,9 @@ static int process_locale(void) { return r; if (!isempty(arg_locale)) - locales[i++] = strappenda("LANG=", arg_locale); + locales[i++] = strjoina("LANG=", arg_locale); if (!isempty(arg_locale_messages) && !streq(arg_locale_messages, arg_locale)) - locales[i++] = strappenda("LC_MESSAGES=", arg_locale_messages); + locales[i++] = strjoina("LC_MESSAGES=", arg_locale_messages); if (i == 0) 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("Failed to write %s: %s", etc_localeconf, strerror(-r)); - 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("Cannot query timezone list: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Cannot query timezone list: %m"); print_welcome(); @@ -342,16 +332,12 @@ static int process_timezone(void) { r = readlink_malloc("/etc/localtime", &p); if (r != -ENOENT) { - if (r < 0) { - log_error("Failed to read host timezone: %s", strerror(-r)); - 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) { - 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; @@ -365,13 +351,11 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; - e = strappenda("../usr/share/zoneinfo/", arg_timezone); + e = strjoina("../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; @@ -393,10 +377,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("Failed to query hostname: %s", strerror(-r)); - 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 +415,8 @@ static int process_hostname(void) { mkdir_parents(etc_hostname, 0755); r = write_string_file(etc_hostname, arg_hostname); - if (r < 0) { - log_error("Failed to write %s: %s", etc_hostname, strerror(-r)); - 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; @@ -451,18 +431,13 @@ static int process_machine_id(void) { if (faccessat(AT_FDCWD, etc_machine_id, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) return 0; - if (!arg_root) - return 0; - if (sd_id128_equal(arg_machine_id, SD_ID128_NULL)) return 0; 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("Failed to write machine id: %s", strerror(-r)); - 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; @@ -485,26 +460,24 @@ static int prompt_root_password(void) { print_welcome(); putchar('\n'); - msg1 = strappenda(draw_special_char(DRAW_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip): "); - msg2 = strappenda(draw_special_char(DRAW_TRIANGULAR_BULLET), " Please enter new root password again: "); + msg1 = strjoina(draw_special_char(DRAW_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip): "); + msg2 = strjoina(draw_special_char(DRAW_TRIANGULAR_BULLET), " Please enter new root password again: "); for (;;) { _cleanup_free_ char *a = NULL, *b = NULL; - r = ask_password_tty(msg1, 0, NULL, &a); - if (r < 0) { - log_error("Failed to query root password: %s", strerror(-r)); - return r; - } + r = ask_password_tty(msg1, 0, false, NULL, &a); + if (r < 0) + return log_error_errno(r, "Failed to query root password: %m"); if (isempty(a)) { log_warning("No password entered, skipping."); break; } - r = ask_password_tty(msg2, 0, NULL, &b); + r = ask_password_tty(msg2, 0, false, NULL, &b); if (r < 0) { - log_error("Failed to query root password: %s", strerror(-r)); + log_error_errno(r, "Failed to query root password: %m"); clear_string(a); return r; } @@ -589,15 +562,13 @@ static int process_root_password(void) { 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; } r = write_root_shadow(etc_shadow, p); - if (r < 0) { - log_error("Failed to write %s: %s", etc_shadow, strerror(-r)); - 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; @@ -612,10 +583,8 @@ static int process_root_password(void) { return 0; r = dev_urandom(raw, 16); - if (r < 0) { - log_error("Failed to get salt: %s", strerror(-r)); - 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); @@ -631,24 +600,21 @@ static int process_root_password(void) { if (!errno) errno = -EINVAL; - log_error("Failed to encrypt password: %m"); + log_error_errno(errno, "Failed to encrypt password: %m"); return -errno; } item.sp_lstchg = (long) (now(CLOCK_REALTIME) / USEC_PER_DAY); r = write_root_shadow(etc_shadow, &item); - if (r < 0) { - log_error("Failed to write %s: %s", etc_shadow, strerror(-r)); - 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; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...]\n\n" "Configures basic settings of the system.\n\n" " -h --help Show this help\n" @@ -665,15 +631,13 @@ static int help(void) { " --prompt-timezone Prompt the user for timezone\n" " --prompt-hostname Prompt the user for hostname\n" " --prompt-root-password Prompt the user for root password\n" - " --prompt Prompt for locale, timezone, hostname, root password\n" + " --prompt Prompt for all of the above\n" " --copy-locale Copy locale from host\n" " --copy-timezone Copy timezone from host\n" " --copy-root-password Copy root password from host\n" " --copy Copy locale, timezone, root password\n" - " --setup-machine-id Generate a new random machine ID\n", - program_invocation_short_name); - - return 0; + " --setup-machine-id Generate a new random machine ID\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -729,12 +693,13 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -808,10 +773,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("Failed to read %s: %s", optarg, strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read %s: %m", optarg); break; @@ -858,6 +821,7 @@ static int parse_argv(int argc, char *argv[]) { case ARG_COPY: arg_copy_locale = arg_copy_timezone = arg_copy_root_password = true; + break; case ARG_COPY_LOCALE: arg_copy_locale = true; @@ -874,10 +838,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("Failed to generate randomized machine ID: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to generate randomized machine ID: %m"); break; @@ -887,7 +849,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; }