diff --git a/+POST_INSTALL b/+POST_INSTALL index ceefcec0c..a7341ca5b 100644 --- a/+POST_INSTALL +++ b/+POST_INSTALL @@ -4,8 +4,8 @@ cp /etc/shells /etc/shells.bak echo /usr/local/etc/rc.initial) > /etc/shells rm -f /etc/shells.bak cp /etc/shells /etc/shells.bak -(grep -v /usr/local/etc/rc.installer /etc/shells.bak; \ - echo /usr/local/etc/rc.installer) > /etc/shells +(grep -v /usr/local/sbin/opnsense-installer /etc/shells.bak; \ + echo /usr/local/sbin/opnsense-installer) > /etc/shells rm -f /etc/shells.bak echo "Registering root shell" diff --git a/+PRE_DEINSTALL b/+PRE_DEINSTALL index c73ae6382..ce40b8862 100644 --- a/+PRE_DEINSTALL +++ b/+PRE_DEINSTALL @@ -8,7 +8,7 @@ cp /etc/shells /etc/shells.bak (grep -v /usr/local/etc/rc.initial /etc/shells.bak) > /etc/shells rm -f /etc/shells.bak cp /etc/shells /etc/shells.bak -(grep -v /usr/local/etc/rc.installer /etc/shells.bak) > /etc/shells +(grep -v /usr/local/sbin/opnsense-installer /etc/shells.bak) > /etc/shells rm -f /etc/shells.bak echo "Unhooking from /etc/rc" diff --git a/plist b/plist index 2c7ef0332..29bb327c5 100644 --- a/plist +++ b/plist @@ -108,7 +108,6 @@ /usr/local/etc/rc.initial.restore /usr/local/etc/rc.initial.setlanip /usr/local/etc/rc.initial.setports -/usr/local/etc/rc.installer /usr/local/etc/rc.interfaces_wan_configure /usr/local/etc/rc.ipfw /usr/local/etc/rc.ipfw.flush_all diff --git a/src/etc/rc.installer b/src/etc/rc.installer deleted file mode 100755 index 30f5b40b7..000000000 --- a/src/etc/rc.installer +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2014-2018 Franco Fichtner -# Copyright (c) 2004-2009 Scott Ullrich -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -if [ "$(id -u)" != "0" ]; then - echo "Must be root." - exit 1 -fi - -sysctl kern.geom.debugflags=16 >/dev/null -sysctl net.link.ether.inet.log_arp_wrong_iface=0 >/dev/null - -rm -f /tmp/install_complete - -daemon -f lua50c51 /usr/local/share/dfuibe_lua/main.lua \ - /usr/local/share/dfuibe_lua/conf/BSDInstaller.lua \ - /usr/local/share/dfuibe_lua/conf/FreeBSD.lua \ - /usr/local/share/dfuibe_lua/conf/Product.lua - -conscontrol mute on > /dev/null - -dfuife_curses -b /usr/local/share/dfuife_curses/hourglass.txt - -conscontrol mute off > /dev/null - -if [ ! -f /tmp/install_complete ]; then - echo "The installation was aborted." - echo - exit -fi - -clear - -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo "The installation finished successfully." -echo -echo "After reboot, open a web browser and navigate to" -echo "https://192.168.1.1 (or the LAN IP address)." -echo -echo "You might need to acknowledge the HTTPS certificate if " -echo "your browser reports it as untrusted. This is normal" -echo "as a self-signed certificate is used by default." -echo -echo -n "Rebooting in 5 seconds. CTRL-C to abort" -for n in 5 4 3 2 1; do - echo -n "." - sleep 1 -done -echo - -reboot diff --git a/src/etc/rc.subr.d/livemode b/src/etc/rc.subr.d/livemode index b6fd86d84..211c77e6c 100755 --- a/src/etc/rc.subr.d/livemode +++ b/src/etc/rc.subr.d/livemode @@ -52,7 +52,7 @@ if (is_install_media()) { } if ($root) { - $root['shell'] = '/usr/local/etc/rc.installer'; + $root['shell'] = '/usr/local/sbin/opnsense-installer'; $root['name'] = 'installer'; local_user_set($root, true); diff --git a/src/etc/rc.subr.d/recover b/src/etc/rc.subr.d/recover index 93951b329..5713c8eb4 100755 --- a/src/etc/rc.subr.d/recover +++ b/src/etc/rc.subr.d/recover @@ -117,7 +117,7 @@ $known_shells = array( '/usr/local/bin/scponly', '/usr/local/bin/zsh', '/usr/local/etc/rc.initial', - '/usr/local/etc/rc.installer', + '/usr/local/sbin/opnsense-installer', ); foreach ($known_shells as $shell) { diff --git a/src/sbin/opnsense-installer b/src/sbin/opnsense-installer index 43c5522ba..30f5b40b7 100755 --- a/src/sbin/opnsense-installer +++ b/src/sbin/opnsense-installer @@ -1,4 +1,87 @@ #!/bin/sh -# launch the real utility from here -/usr/local/etc/rc.installer "${@}" +# Copyright (c) 2014-2018 Franco Fichtner +# Copyright (c) 2004-2009 Scott Ullrich +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +if [ "$(id -u)" != "0" ]; then + echo "Must be root." + exit 1 +fi + +sysctl kern.geom.debugflags=16 >/dev/null +sysctl net.link.ether.inet.log_arp_wrong_iface=0 >/dev/null + +rm -f /tmp/install_complete + +daemon -f lua50c51 /usr/local/share/dfuibe_lua/main.lua \ + /usr/local/share/dfuibe_lua/conf/BSDInstaller.lua \ + /usr/local/share/dfuibe_lua/conf/FreeBSD.lua \ + /usr/local/share/dfuibe_lua/conf/Product.lua + +conscontrol mute on > /dev/null + +dfuife_curses -b /usr/local/share/dfuife_curses/hourglass.txt + +conscontrol mute off > /dev/null + +if [ ! -f /tmp/install_complete ]; then + echo "The installation was aborted." + echo + exit +fi + +clear + +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo "The installation finished successfully." +echo +echo "After reboot, open a web browser and navigate to" +echo "https://192.168.1.1 (or the LAN IP address)." +echo +echo "You might need to acknowledge the HTTPS certificate if " +echo "your browser reports it as untrusted. This is normal" +echo "as a self-signed certificate is used by default." +echo +echo -n "Rebooting in 5 seconds. CTRL-C to abort" +for n in 5 4 3 2 1; do + echo -n "." + sleep 1 +done +echo + +reboot