pull/8/head
Bohan Yang 5 years ago
parent 963ef78560
commit 79a4cfb982
  1. 18
      debi.sh

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

Loading…
Cancel
Save