From 79a4cfb9822a7dfe0a5da3b13afef7854a1fc833 Mon Sep 17 00:00:00 2001
From: Bohan Yang <youthdna@live.com>
Date: Fri, 9 Apr 2021 05:26:51 +0000
Subject: [PATCH] Update

---
 debi.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debi.sh b/debi.sh
index a2d7389..9780def 100755
--- a/debi.sh
+++ b/debi.sh
@@ -280,17 +280,11 @@ while [ $# -gt 0 ]; do
     shift
 done
 
-if [ -n "$authorized_keys_url" ] && ! download "$authorized_keys_url" /dev/null; then
-    err "Failed to download SSH authorized public keys from \"$authorized_keys_url\""
-fi
-
 installer="debian-$suite"
 installer_directory="/boot/$installer"
 
-if [ "$account_setup" = true ]; then
-    prompt_password
-elif [ "$network_console" = true ] && [ -z "$authorized_keys_url" ]; then
-    prompt_password "Choose a password for the installer user of the SSH network console: "
+if [ -n "$authorized_keys_url" ] && ! download "$authorized_keys_url" /dev/null; then
+    err "Failed to download SSH authorized public keys from \"$authorized_keys_url\""
 fi
 
 save_preseed='cat'
@@ -302,6 +296,12 @@ if [ "$dry_run" = false ]; then
     save_preseed='tee -a preseed.cfg'
 fi
 
+if [ "$account_setup" = true ]; then
+    prompt_password
+elif [ "$network_console" = true ] && [ -z "$authorized_keys_url" ]; then
+    prompt_password "Choose a password for the installer user of the SSH network console: "
+fi
+
 $save_preseed << 'EOF'
 # Localization
 
@@ -503,7 +503,7 @@ EOF
     fi
 
     $save_preseed << 'EOF'
-        1074 1075 -1 $default_filesystem \
+        1075 1076 -1 $default_filesystem \
             method{ format } \
             format{ } \
             use_filesystem{ } \