Merge pull request #4235 from stefansaraev/installer

installer clean up
This commit is contained in:
Stefan Saraev 2015-07-19 14:24:25 +03:00
commit 5583bf2285

View File

@ -206,14 +206,8 @@ do_install_quick() {
esac
prompt_gpt
prompt_ssh
prompt_backup_unpack
EXTLINUX_SSH=""
if [ "$SSH" = "1" ]; then
EXTLINUX_SSH="ssh"
fi
# check for confirmation (twice!)
MSG_TITLE="\Z1[ Confirmation before installing ]\Zn"
MSG_DETAIL="\nIf you continue the target disk will be wiped out:\n\n$INSTALL_DEVICE_FULL\n\n"
@ -329,7 +323,7 @@ do_install_quick() {
echo " " >> $TMPDIR/part1/extlinux.conf
echo "LABEL linux" >> $TMPDIR/part1/extlinux.conf
echo " KERNEL /KERNEL" >> $TMPDIR/part1/extlinux.conf
echo " APPEND boot=LABEL=$DISKLABEL_SYSTEM disk=LABEL=$DISKLABEL_STORAGE $EXTLINUX_PARAMETERS $EXTLINUX_SSH quiet" >> $TMPDIR/part1/extlinux.conf
echo " APPEND boot=LABEL=$DISKLABEL_SYSTEM disk=LABEL=$DISKLABEL_STORAGE $EXTLINUX_PARAMETERS quiet" >> $TMPDIR/part1/extlinux.conf
# uefi boot / hybrid mode
if [ "$UEFI" = "1" ]; then
mv $TMPDIR/part1/extlinux.conf $TMPDIR/part1/syslinux.cfg
@ -565,21 +559,6 @@ prompt_gpt() {
fi
}
prompt_ssh() {
# Prompt for SSH enabling
# usage: prompt_ssh
# uses:
# provides: SSH
MSG_TITLE="\Z1[ Enable SSH Server on start ]\Zn"
MSG_DETAIL="Enable SSH server per default.\nYou should only enable SSH server if you know what you are doing."
DIALOG_OPTIONS="--defaultno"
if dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" $DIALOG_OPTIONS --yesno "$MSG_DETAIL" 0 0; then
SSH="1"
else
SSH="0"
fi
}
prompt_backup_unpack() {
# Prompt for unpacking backup files to /storage
# usage: prompt_backup_unpack