installer: go with this dialog; closes #20

opnsense · Jan 23, 2025 · be546bb · be546bb
1 parent ae1d9d8
commit be546bb
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/src/opnsense.sh b/src/opnsense.sh
@@ -331,7 +331,6 @@ case "${CHOICE}" in
 	exit 0 # "this is fine"
 	;;
 "Force Halt")
-	break; # XXX testing spot
 	exit 42 # "bring a towel"
 	;;
 *)
@@ -341,26 +340,6 @@ esac
 
 done
 
-powerconfig() {
-	exec 3>&1
-	REVISIT=$(dialog --backtitle "OPNsense Installer" \
-	    --title "Installation Complete" --no-cancel --menu \
-	    "Choose how to proceed with this new install.\n
-\n
-Note: The system may boot back into the installation media when not ejected properly." 0 0 0 \
-		"Reboot now" "Reboot system" \
-		"Halt now" "Power down system" 2>&1 1>&3)
-	exec 3>&-
-
-	case "$REVISIT" in
-	"Halt now")
-		exit 42 # "bring a towel"
-		;;
-	esac
-}
-
-powerconfig # XXX testing spot
-
 bsdinstall opnsense-install || error "Failed to install"
 
 # Set up boot loader
@@ -401,6 +380,25 @@ bsdinstall umount
 
 f_dprintf "Installation Completed at %s" "$( date )"
 
+powerconfig() {
+	exec 3>&1
+	REVISIT=$(dialog --backtitle "OPNsense Installer" \
+	    --title "Installation Complete" --no-cancel --menu \
+	    "The system may boot back into the installation media when not ejected properly." 0 0 0 \
+		"Reboot now" "Reboot system" \
+		"Halt now" "Power down system" 2>&1 1>&3)
+	exec 3>&-
+
+	case "$REVISIT" in
+	"Halt now")
+		exit 42 # "bring a towel"
+		;;
+	esac
+}
+
+# And we are done!
+powerconfig
+
 ################################################################################
 # END
 ################################################################################