From 3263ea3875564c36e8affaa5f58d9a2a6992c054 Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Tue, 4 Nov 2025 21:54:21 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E6=94=B9=E6=88=90=E4=BD=BF=E7=94=A8=20?=
 =?UTF-8?q?/dev/urandom=20=E4=BB=A5=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E5=AF=86=E7=A0=81=E6=97=B6=E9=98=BB=E5=A1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #469
fixes #471
---
 reinstall.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/reinstall.sh b/reinstall.sh
index a937749..5c63188 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -2343,10 +2343,6 @@ prompt_password() {
     warn false "Leave blank to use a random password."
     warn false "不填写则使用随机密码"
     while true; do
-        # 特殊字符列表
-        # https://learn.microsoft.com/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/hh994562(v=ws.11)
-        chars=\''A-Za-z0-9~!@#$%^&*_=+`|(){}[]:;"<>,.?/-'
-        random_password=$(tr -dc "$chars" </dev/random | head -c16)
         IFS= read -r -p "Password: " password
         if [ -n "$password" ]; then
             IFS= read -r -p "Retype password: " password_confirm
@@ -2356,7 +2352,11 @@ prompt_password() {
                 error "Passwords don't match. Try again."
             fi
         else
-            password=$random_password
+            # 特殊字符列表
+            # https://learn.microsoft.com/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/hh994562(v=ws.11)
+            # 有的机器运行 centos 7 ，用 /dev/random 产生 16 位密码，开启了 rngd 也要 5 秒，关闭了 rngd 则长期阻塞
+            chars=\''A-Za-z0-9~!@#$%^&*_=+`|(){}[]:;"<>,.?/-'
+            password=$(tr -dc "$chars" </dev/urandom | head -c16)
             break
         fi
     done