Bohan Yang 5 年之前
父節點
當前提交
e2433cbe5d
共有 1 個文件被更改,包括 8 次插入5 次删除
  1. 8 5
      netboot.sh

+ 8 - 5
netboot.sh

@@ -302,16 +302,17 @@ if [ "$skip_account_setup" != true ]; then
 
     if command_exists mkpasswd; then
         if [ -z "$password" ]; then
-            password="$(mkpasswd -m sha512crypt)"
+            password="$(mkpasswd -m sha-512)"
         else
-            password="$(mkpasswd -m sha512crypt "$password")"
+            password="$(mkpasswd -m sha-512 "$password")"
         fi
     elif command_exists busybox && busybox mkpasswd --help >/dev/null 2>&1; then
         if [ -z "$password" ]; then
-            password="$(busybox mkpasswd -m sha512)"
-        else
-            password="$(busybox mkpasswd -m sha512 "$password")"
+            printf '\n%s' 'Password: ' 1>&2
+            read -rs password
+            echo 1>&2
         fi
+        password="$(busybox mkpasswd -m sha512 "$password")"
     elif command_exists python3; then
         if [ -z "$password" ]; then
             password="$(python3 -c 'import crypt, getpass; print(crypt.crypt(getpass.getpass(), crypt.mksalt(crypt.METHOD_SHA512)))')"
@@ -321,7 +322,9 @@ if [ "$skip_account_setup" != true ]; then
     else
         cleartext_password=true
         if [ -z "$password" ]; then
+            printf '\n%s' 'Password: ' 1>&2
             read -rs password
+            echo 1>&2
         fi
     fi