From a08b8ec72b7e7b65efdc8ec32a46e8eb54e68df0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 13 Apr 2021 09:34:29 +0200
Subject: [PATCH] installer: switch installer package

---
 Makefile                          |  2 +-
 src/man/man8/opnsense-installer.8 | 22 +++++++++++++---------
 src/sbin/opnsense-installer       | 16 +++++++++++++---
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index ada10d2ad..b2bf29b3a 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,6 @@ CORE_COPYRIGHT_WWW?=	https://www.deciso.com/
 CORE_COPYRIGHT_YEARS?=	2014-2021
 
 CORE_DEPENDS_amd64?=	beep \
-			bsdinstaller \
 			suricata-devel
 
 CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
@@ -133,6 +132,7 @@ CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
 			ntp \
 			openssh-portable \
 			openvpn \
+			opnsense-installer \
 			opnsense-lang \
 			opnsense-update \
 			pam_opnsense \
diff --git a/src/man/man8/opnsense-installer.8 b/src/man/man8/opnsense-installer.8
index 0bf5bd85c..35aa3f0e0 100644
--- a/src/man/man8/opnsense-installer.8
+++ b/src/man/man8/opnsense-installer.8
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2018 Franco Fichtner <franco@opnsense.org>
+.\" Copyright (c) 2018-2021 Franco Fichtner <franco@opnsense.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 19, 2018
+.Dd April 13, 2021
 .Dt OPNSENSE-INSTALLER 8
 .Os
 .Sh NAME
@@ -36,22 +36,26 @@
 The
 .Nm
 utility will launch the graphical installation process.
-The installation is driven by a frontend connected to the backend
-process via local socket.
 .Pp
 The purpose of the installer is to install the system on a target
-disk using several options like UFS, ZFS, GEOM mirror, GPT, MBR, etc.
+disk using UFS or ZFS.
 It may also carry out tasks such as configuration import or password
 recovery.
 .Sh SEE ALSO
-.Xr opnsense-importer 8
+.Xr bsdinstall 8 ,
+.Xr opnsense-importer 8 ,
+.Xr opnsense-shell 8
 .Sh HISTORY
 The
 .Nm
-utility operates the historical
+utility operated the historical
 .Nm bsdinstaller ,
 which first appeared in
-.Dx .
-Both projects no longer use these programs.
+.Dx ,
+until OPNsense 21.1.
+Due to modern incompatibilities in the graphical library and missing
+features it has been migrated to
+.Nm bsdinstall
+in OPNsense 21.7.
 .Sh AUTHORS
 .An Scott Ullrich Aq Mt sullrich@gmail.com
diff --git a/src/sbin/opnsense-installer b/src/sbin/opnsense-installer
index 770ed8fdf..b31beeb22 100755
--- a/src/sbin/opnsense-installer
+++ b/src/sbin/opnsense-installer
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2018 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2021 Franco Fichtner <franco@opnsense.org>
 # Copyright (c) 2004-2009 Scott Ullrich <sullrich@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,10 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi
 
+rm -f /tmp/install_complete
+
+bsdinstaller()
+{
 sysctl kern.geom.debugflags=16 >/dev/null
 sysctl net.link.ether.inet.log_arp_wrong_iface=0 >/dev/null
 
@@ -44,8 +48,6 @@ if [ -z "${TERM}" ]; then
 	fi
 fi
 
-rm -f /tmp/install_complete
-
 CONFIGDIR=/usr/local/share/dfuibe_lua
 CONFIGS=${CONFIGDIR}/main.lua
 
@@ -62,6 +64,14 @@ conscontrol mute on > /dev/null
 dfuife_curses -b /usr/local/share/dfuife_curses/hourglass.txt
 
 conscontrol mute off > /dev/null
+}
+
+# XXX compat glue for now
+if [ -e /usr/libexec/bsdinstall/opnsense ]; then
+	bsdinstall opnsense
+else
+	bsdinstaller
+fi
 
 if [ ! -f /tmp/install_complete ]; then
 	echo "The installation was aborted."