Reduce differences with root_skels in contrib.
authorSascha Wildner <swildner@dragonflybsd.org>
Thu, 23 Oct 2008 16:45:37 +0000 (16:45 +0000)
committerSascha Wildner <swildner@dragonflybsd.org>
Thu, 23 Oct 2008 16:45:37 +0000 (16:45 +0000)
nrelease/gui/etc/defaults/pfi.conf
nrelease/gui/usr/local/bin/installer
nrelease/installer/etc/defaults/pfi.conf
nrelease/installer/usr/local/bin/installer

index 2a65cae..edf8028 100644 (file)
@@ -1,6 +1,6 @@
 #######################################################################
 # $Id: pfi.conf,v 1.7 2005/02/24 23:23:15 cpressey Exp $
-# $DragonFly: src/nrelease/gui/etc/defaults/pfi.conf,v 1.1 2008/09/01 21:20:30 swildner Exp $
+# $DragonFly: src/nrelease/gui/etc/defaults/pfi.conf,v 1.2 2008/10/23 16:45:36 swildner Exp $
 # Defaults for pfi.conf.
 
 # A space-separated list of what services to restart when we are done
@@ -18,14 +18,10 @@ pfi_rc_actions=""
 pfi_frontend="xorg"
 
 # Determines which installer backend to use.  Typically this is
-# "/usr/pkg/sbin/dfuibe_installer", the traditional C backend,
+# "/usr/sbin/dfuibe_installer", the traditional C backend,
 # but can be changed to start an alternate backend.
 
-if [ -f /usr/sbin/dfuibe_installer ]; then
-   pfi_backend="/usr/sbin/dfuibe_installer"
-else
-   pfi_backend="/usr/pkg/sbin/dfuibe_installer"
-fi   
+pfi_backend="/usr/sbin/dfuibe_installer"
 
 # When using the curses frontend:
 # Set the amount of time, in milliseconds, which must pass after
@@ -108,6 +104,32 @@ pfi_shutdown_command="shutdown -h now"
 # pfi_shutdown_command="shutdown -r now"
 
 # EXAMPLE 3:
+# Boot the cd and setup a PXE/TFTP/DCHPD server environment
+# so that clients can boot from the network and enter the installer
+#
+# Enable tftp and NFS services with pxeboot and a kernel available via
+# tftp and the CD's root mount available via NFS.
+#
+# pfi_boot_tftp_server="YES"
+# pfi_boot_nfs_server="YES"
+# pfi_boot_pxeserver="YES"
+# pfi_boot_ipserver="YES"
+# pfi_option_subnet-mask="255.255.255.0"
+# pfi_option_routers="10.0.250.1"
+# pfi_filename="pxeboot"
+# pfi_ddns-update-style="none"
+# pfi_option_domain-name="domain.com"
+# pfi_option_broadcast-address="10.0.250.255"
+# pfi_option_domain-name-servers="192.168.64.3"
+# pfi_server-name="DHCPServer"
+# pfi_server-identifier="10.0.250.50"
+# pfi_default-lease-time="7200"
+# pfi_max-lease-time="7200"
+# pfi_subnet="10.0.250.0 netmask 255.255.255.0"
+# pfi_next-server="10.0.250.50"
+# pfi_range="10.0.250.29 10.0.250.250"
+
+# EXAMPLE 4:
 # Use a custom backend.
 #
 # pfi_backend="/usr/pkg/sbin/my_custom_backend"
index 2fabfc5..9931288 100755 (executable)
@@ -2,17 +2,7 @@
 
 # installer - start installer frontend and backend as per pfi config.
 # $Id: installer,v 1.20 2005/04/13 03:32:16 cpressey Exp $
-# $DragonFly: src/nrelease/gui/usr/local/bin/installer,v 1.1 2008/09/01 21:20:31 swildner Exp $
-
-### CONFIG ###
-# Pick up the correct installer target, use local first if we have it
-if [ -f /usr/sbin/dfuife_curses ]; then
-    FRONTEND=/usr/sbin/dfuife_curses
-    FRED=/usr/share/installer/fred.txt
-else
-    FRONTEND=/usr/pkg/sbin/dfuife_curses
-    FRED=/usr/pkg/share/dfuife_curses/fred.txt
-fi
+# $DragonFly: src/nrelease/gui/usr/local/bin/installer,v 1.2 2008/10/23 16:45:36 swildner Exp $
 
 ### SUBS ###
 
@@ -82,10 +72,10 @@ installer_start()
                background_backend $RENDEZVOUS $pfi_dfui_transport &
                sleep 1
                ESCDELAY=$pfi_curses_escdelay \
-                   ${FRONTEND} \
+                   /usr/sbin/dfuife_curses \
                        -r $RENDEZVOUS \
                        -t $pfi_dfui_transport \
-                       -b /usr/share/dfuife_curses/fred.txt \
+                       -b /usr/share/installer/fred.txt \
                    2>/dev/null
                pfi_frontend=none
        fi
@@ -105,10 +95,10 @@ installer_start()
                        # Frontend is already running.
                else
                        ESCDELAY=$pfi_curses_escdelay \
-                           $FRONTEND \
+                           /usr/sbin/dfuife_curses \
                                -r $RENDEZVOUS \
                                -t $pfi_dfui_transport \
-                               -b $FRED \
+                               -b /usr/share/installer/fred.txt \
                            2>/dev/ttyv0 </dev/ttyv1 >/dev/ttyv1 &
                fi
                rm -f /tmp/ps.txt
@@ -126,10 +116,10 @@ installer_start()
                        echo "Frontend is already running"
                else
                        ESCDELAY=$pfi_curses_escdelay \
-                       $FRONTEND \
+                       /usr/sbin/dfuife_curses \
                        -r $RENDEZVOUS \
                        -t $pfi_dfui_transport \
-                       -b $FRED \
+                       -b /usr/share/installer/fred.txt \
                        >$TTY_INST <$TTY_INST 2>&1 &
                fi
                rm -f /tmp/ps.txt
index ec8de37..69ecbff 100644 (file)
@@ -1,6 +1,6 @@
 #######################################################################
 # $Id: pfi.conf,v 1.7 2005/02/24 23:23:15 cpressey Exp $
-# $DragonFly: src/nrelease/installer/etc/defaults/pfi.conf,v 1.8 2008/03/25 22:55:38 dave Exp $
+# $DragonFly: src/nrelease/installer/etc/defaults/pfi.conf,v 1.9 2008/10/23 16:45:36 swildner Exp $
 # Defaults for pfi.conf.
 
 # A space-separated list of what services to restart when we are done
@@ -18,14 +18,10 @@ pfi_rc_actions=""
 pfi_frontend="curses"
 
 # Determines which installer backend to use.  Typically this is
-# "/usr/pkg/sbin/dfuibe_installer", the traditional C backend,
+# "/usr/sbin/dfuibe_installer", the traditional C backend,
 # but can be changed to start an alternate backend.
 
-if [ -f /usr/sbin/dfuibe_installer ]; then
-   pfi_backend="/usr/sbin/dfuibe_installer"
-else
-   pfi_backend="/usr/pkg/sbin/dfuibe_installer"
-fi   
+pfi_backend="/usr/sbin/dfuibe_installer"
 
 # When using the curses frontend:
 # Set the amount of time, in milliseconds, which must pass after
@@ -108,6 +104,32 @@ pfi_shutdown_command="shutdown -h now"
 # pfi_shutdown_command="shutdown -r now"
 
 # EXAMPLE 3:
+# Boot the cd and setup a PXE/TFTP/DCHPD server environment
+# so that clients can boot from the network and enter the installer
+#
+# Enable tftp and NFS services with pxeboot and a kernel available via
+# tftp and the CD's root mount available via NFS.
+#
+# pfi_boot_tftp_server="YES"
+# pfi_boot_nfs_server="YES"
+# pfi_boot_pxeserver="YES"
+# pfi_boot_ipserver="YES"
+# pfi_option_subnet-mask="255.255.255.0"
+# pfi_option_routers="10.0.250.1"
+# pfi_filename="pxeboot"
+# pfi_ddns-update-style="none"
+# pfi_option_domain-name="domain.com"
+# pfi_option_broadcast-address="10.0.250.255"
+# pfi_option_domain-name-servers="192.168.64.3"
+# pfi_server-name="DHCPServer"
+# pfi_server-identifier="10.0.250.50"
+# pfi_default-lease-time="7200"
+# pfi_max-lease-time="7200"
+# pfi_subnet="10.0.250.0 netmask 255.255.255.0"
+# pfi_next-server="10.0.250.50"
+# pfi_range="10.0.250.29 10.0.250.250"
+
+# EXAMPLE 4:
 # Use a custom backend.
 #
 # pfi_backend="/usr/pkg/sbin/my_custom_backend"
index a816db7..96957fa 100755 (executable)
@@ -2,17 +2,7 @@
 
 # installer - start installer frontend and backend as per pfi config.
 # $Id: installer,v 1.20 2005/04/13 03:32:16 cpressey Exp $
-# $DragonFly: src/nrelease/installer/usr/local/bin/installer,v 1.11 2008/03/25 22:55:38 dave Exp $
-
-### CONFIG ###
-# Pick up the correct installer target, use local first if we have it
-if [ -f /usr/sbin/dfuife_curses ]; then
-    FRONTEND=/usr/sbin/dfuife_curses
-    FRED=/usr/share/installer/fred.txt
-else
-    FRONTEND=/usr/pkg/sbin/dfuife_curses
-    FRED=/usr/pkg/share/dfuife_curses/fred.txt
-fi
+# $DragonFly: src/nrelease/installer/usr/local/bin/installer,v 1.12 2008/10/23 16:45:37 swildner Exp $
 
 ### SUBS ###
 
@@ -82,10 +72,10 @@ installer_start()
                background_backend $RENDEZVOUS $pfi_dfui_transport &
                sleep 1
                ESCDELAY=$pfi_curses_escdelay \
-                   ${FRONTEND} \
+                   /usr/sbin/dfuife_curses \
                        -r $RENDEZVOUS \
                        -t $pfi_dfui_transport \
-                       -b /usr/share/dfuife_curses/fred.txt \
+                       -b /usr/share/installer/fred.txt \
                    2>/dev/null
                pfi_frontend=none
        fi
@@ -105,10 +95,10 @@ installer_start()
                        # Frontend is already running.
                else
                        ESCDELAY=$pfi_curses_escdelay \
-                           $FRONTEND \
+                           /usr/sbin/dfuife_curses \
                                -r $RENDEZVOUS \
                                -t $pfi_dfui_transport \
-                               -b $FRED \
+                               -b /usr/share/installer/fred.txt \
                            2>/dev/ttyv0 </dev/ttyv1 >/dev/ttyv1 &
                fi
                rm -f /tmp/ps.txt