diff --git a/reinstall.sh b/reinstall.sh index 8ce051f..c246a2e 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -9,6 +9,7 @@ github_proxy=https://mirror.ghproxy.com/https://raw.githubusercontent.com export LC_ALL=C # 处理部分用户用 su 切换成 root 导致环境变量没 sbin 目录 +# 不要漏了最后的 $PATH,否则会找不到 windows 系统程序例如 diskpart export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH this_script=$(realpath "$0") @@ -3036,21 +3037,24 @@ fi info 'info' echo "$distro $releasever" -if is_netboot_xyz; then - echo 'Reboot to start netboot.xyz.' -elif is_alpine_live; then - echo 'Reboot to start Alpine Live OS.' -elif is_use_dd; then - echo 'Reboot to start DD.' -else + +if ! { is_netboot_xyz || is_use_dd; }; then if [ "$distro" = windows ]; then username="administrator" else username="root" fi - echo "Username: $username" echo "Password: 123@@@" +fi + +if is_netboot_xyz; then + echo 'Reboot to start netboot.xyz.' +elif is_alpine_live; then + echo 'Reboot to start Alpine Live OS.' +elif is_use_dd; then + echo 'Reboot to start DD.' +else echo "Reboot to start the installation." fi