From e2433cbe5de50932805ee0be82197eba40be1827 Mon Sep 17 00:00:00 2001
From: Bohan Yang <youthdna@live.com>
Date: Tue, 3 Nov 2020 14:41:46 +0000
Subject: [PATCH] Update

---
 netboot.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 netboot.sh

diff --git a/netboot.sh b/netboot.sh
old mode 100644
new mode 100755
index 731f083..ed37613
--- a/netboot.sh
+++ b/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