Synch to modifications in the installer scripts:
authorChris Pressey <cpressey@dragonflybsd.org>
Sun, 11 Jul 2004 01:55:28 +0000 (01:55 +0000)
committerChris Pressey <cpressey@dragonflybsd.org>
Sun, 11 Jul 2004 01:55:28 +0000 (01:55 +0000)
- Enable TCP transport and make it the default for communication
between installer frontend and backend (to overcome the the 128K
message size limitation in CAPS.)
- Use 'shutdown -h now' instead of 'shutdown -r now' for rebooting.

nrelease/installer/etc/defaults/pfi.conf
nrelease/installer/usr/local/bin/installer

index 0b43ba0..7d2e3f7 100644 (file)
@@ -1,6 +1,6 @@
 #######################################################################
-# $Id: pfi.conf,v 1.1 2004/07/09 23:25:40 cpressey Exp $
-# $DragonFly: src/nrelease/installer/etc/defaults/pfi.conf,v 1.1 2004/07/10 22:26:17 dillon Exp $
+# $Id: pfi.conf,v 1.2 2004/07/10 21:52:27 cpressey Exp $
+# $DragonFly: src/nrelease/installer/etc/defaults/pfi.conf,v 1.2 2004/07/11 01:55:28 cpressey Exp $
 # Defaults for pfi.conf.
 
 # A space-seperated list of what services to restart when we are done
@@ -39,9 +39,9 @@ pfi_script=""
 pfi_run=""
 
 # What transport layer the DFUI in the installer should use.  Valid
-# values are currently "caps" or "npipe".
+# values are currently "caps", "npipe", and "tcp".
 
-pfi_dfui_transport="caps"
+pfi_dfui_transport="tcp"
 
 #######################################################################
 # EXAMPLES
index 8b799f0..c762d5e 100755 (executable)
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # installer - start installer frontend and backend as per pfi config.
-# $Id: installer,v 1.1 2004/07/09 23:25:40 cpressey Exp $
-# $DragonFly: src/nrelease/installer/usr/local/bin/installer,v 1.1 2004/07/10 22:26:19 dillon Exp $
+# $Id: installer,v 1.4 2004/07/10 23:30:41 cpressey Exp $
+# $DragonFly: src/nrelease/installer/usr/local/bin/installer,v 1.2 2004/07/11 01:55:28 cpressey Exp $
 
 # auto-login on ttyv0.
 # backend (and all other logging) on ttyv0 (console.)
@@ -37,8 +37,13 @@ installer_start()
        case "X$pfi_dfui_transport" in
        Xcaps)
                sysctl kern.caps_enabled=1
+               RENDEZVOUS="installer"
                ;;
        Xnpipe)
+               RENDEZVOUS="installer"
+               ;;
+       Xtcp)
+               RENDEZVOUS="9999"
                ;;
        *)
                echo "Unsupported DFUI transport '$pfi_dfui_transport'."
@@ -58,7 +63,7 @@ installer_start()
                if grep -q dfuife_curses /tmp/ps.txt; then
                        # Frontend is already running.
                else
-                       /usr/local/sbin/dfuife_curses -r installer \
+                       /usr/local/sbin/dfuife_curses -r $RENDEZVOUS \
                            -t $pfi_dfui_transport \
                            -b /usr/local/share/dfuife_curses/fred.txt \
                            2>/dev/ttyv0 </dev/ttyv1 >/dev/ttyv1 &
@@ -66,7 +71,7 @@ installer_start()
                sleep 1
                vidcontrol -s 2
                cp /usr/local/sbin/dfuibe_installer /var/run/dfuibe_installer
-               /var/run/dfuibe_installer -r installer -t $pfi_dfui_transport
+               /var/run/dfuibe_installer -r $RENDEZVOUS -t $pfi_dfui_transport
                RESULT=$?
                sleep 1
                killall dfuife_curses
@@ -85,8 +90,7 @@ installer_start()
        0)
                ;;
        5)
-               echo "Rebooting..."
-               shutdown -r now
+               shutdown -h now
                ;;
        *)
                ;;