chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
localectl: fix localectl set-x11-keymap syntax description
[elogind.git]
/
src
/
firstboot
/
firstboot.c
diff --git
a/src/firstboot/firstboot.c
b/src/firstboot/firstboot.c
index f586c2ef7fca900354f662606aba830e8973f76b..93273d903c7299e040e81e1ac13296e6dd4db6b2 100644
(file)
--- a/
src/firstboot/firstboot.c
+++ b/
src/firstboot/firstboot.c
@@
-451,9
+451,6
@@
static int process_machine_id(void) {
if (faccessat(AT_FDCWD, etc_machine_id, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
return 0;
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;
if (sd_id128_equal(arg_machine_id, SD_ID128_NULL))
return 0;
@@
-491,7
+488,7
@@
static int prompt_root_password(void) {
for (;;) {
_cleanup_free_ char *a = NULL, *b = NULL;
for (;;) {
_cleanup_free_ char *a = NULL, *b = NULL;
- r = ask_password_tty(msg1, 0, NULL, &a);
+ r = ask_password_tty(msg1, 0,
false,
NULL, &a);
if (r < 0) {
log_error("Failed to query root password: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to query root password: %s", strerror(-r));
return r;
@@
-502,7
+499,7
@@
static int prompt_root_password(void) {
break;
}
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));
clear_string(a);
if (r < 0) {
log_error("Failed to query root password: %s", strerror(-r));
clear_string(a);