Compare commits

..

No commits in common. "325071c2f1e853aaefa789dd29ce74b34f706c8d" and "9e9b8286ad52f75d1a2b26f686e74bcc8c72528a" have entirely different histories.

1 changed files with 26 additions and 22 deletions

View File

@ -268,23 +268,32 @@ advanced_settings() {
fi fi
done done
if [ "$NET" != "dhcp" ]; then while true; do
while true; do GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3)
GATE1=$(whiptail --inputbox "Enter gateway IP address" 8 58 --title "Gateway IP" 3>&1 1>&2 2>&3) exit_status=$?
if [ $exit_status -eq 0 ]; then
if [ -z "$GATE1" ]; then if [ -z "$GATE1" ]; then
whiptail --msgbox "Gateway IP address cannot be empty" 8 58 if [ "$NET" = "dhcp" ]; then
elif [[ ! "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then GATE1="Default"
whiptail --msgbox "Invalid IP address format" 8 58 GATE=""
echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
break
else
whiptail --msgbox "Since a static IP was used, a gateway IP address is mandatory." 8 58
fi
else else
GATE=",gw=$GATE1" if [[ "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}" GATE=",gw=$GATE1"
break echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
break
else
whiptail --msgbox "Invalid IP address. Please enter a valid IP address." 8 58
fi
fi fi
done else
else exit-script
GATE="" fi
echo -e "${DGN}Using Gateway IP Address: ${BGN}Default${CL}" done
fi
if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
DISABLEIP6="yes" DISABLEIP6="yes"
@ -354,17 +363,12 @@ advanced_settings() {
exit-script exit-script
fi fi
if [[ "$PW" == -password* ]]; then if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then SSH="yes"
SSH="yes"
else
SSH="no"
fi
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
else else
SSH="no" SSH="no"
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
fi fi
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then
if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then