From 1e877de9245514d1fddbc84c5d93ec9dfff6c1a6 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 17 Dec 2012 18:23:13 +0100 Subject: [PATCH] installer: Use the LiveDVD's pfi.conf generally (works for LiveCD too). --- etc/Makefile | 2 +- {nrelease/gui/etc => etc}/defaults/pfi.conf | 0 nrelease/root/etc/defaults/pfi.conf | 134 -------------------- 3 files changed, 1 insertion(+), 135 deletions(-) rename {nrelease/gui/etc => etc}/defaults/pfi.conf (100%) delete mode 100644 nrelease/root/etc/defaults/pfi.conf diff --git a/etc/Makefile b/etc/Makefile index 27c91bc6b5..e6fb247820 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -55,7 +55,7 @@ DIRS+= libexec/dma BIN2= pccard_ether rc.firewall rc.suspend rc.resume DEFAULTS= compilers.conf devfs.conf make.conf mkinitrd.conf periodic.conf \ - rc.conf uuids + pfi.conf rc.conf uuids MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \ BSD.var.dist diff --git a/nrelease/gui/etc/defaults/pfi.conf b/etc/defaults/pfi.conf similarity index 100% rename from nrelease/gui/etc/defaults/pfi.conf rename to etc/defaults/pfi.conf diff --git a/nrelease/root/etc/defaults/pfi.conf b/nrelease/root/etc/defaults/pfi.conf deleted file mode 100644 index 4ff6dba979..0000000000 --- a/nrelease/root/etc/defaults/pfi.conf +++ /dev/null @@ -1,134 +0,0 @@ -####################################################################### -# $Id: pfi.conf,v 1.7 2005/02/24 23:23:15 cpressey Exp $ -# Defaults for pfi.conf. - -# A space-separated list of what services to restart when we are done -# changing options. The services are the base names of RCNG scripts -# (i.e. without the "/etc/rc.d/" prefix.) Note that these must be -# given explicitly in the same order they would normally be started -# by rcorder during RCNG (e.g. "netif dhclient sshd"); they are not -# automatically ordered by their dependencies here. - -pfi_rc_actions="" - -# Determines which installer frontend to use. Defaults to "curses"; -# other legal options are "cgi" and "none". - -pfi_frontend="curses" - -# Determines which installer backend to use. Typically this is -# "/usr/sbin/dfuibe_installer", the traditional C backend, -# but can be changed to start an alternate backend. - -pfi_backend="/usr/sbin/dfuibe_installer" - -# When using the curses frontend: -# Set the amount of time, in milliseconds, which must pass after -# the 'ESC' key is pressed, in order for it to be recognized -# as a plain 'ESC' keystroke, and not part of an escape code. - -pfi_curses_escdelay="150" - -# A password to set as the root password on the LiveCD, if any. - -pfi_set_root_password="" - -# Control corresponding sshd options. To make sure sshd restarts with -# these options, add "sshd" to pfi_rc_actions. - -pfi_sshd_permit_root_login="NO" -pfi_sshd_permit_empty_passwords="NO" - -# An script to run before the installer. It is assumed this script is -# located on the pfi media. While it is run, the media's root directory -# is mounted on /mnt. - -pfi_script="" - -# A program to run before the installer. It is assumed to reside on -# the LiveCD; /mnt is not mounted. - -pfi_run="" - -# What transport layer the DFUI in the installer should use. Valid -# values are currently "npipe" and "tcp". - -pfi_dfui_transport="tcp" - -# User to automatically log in as, or "NONE". - -pfi_autologin="NONE" - -# Command to use to reboot. "shutdown -h now" is typically used -# interactively, to give the user a chance to eject the disk, but -# "shutdown -r now" can be used for headless operation. - -pfi_shutdown_command="shutdown -h now" - -####################################################################### -# EXAMPLES -# To use one of these examples, extract it to a text file and remove the -# leading pound-signs. Copy this text file to the file "/pfi.conf" -# on a floppy disk or USB pen drive (hereinafter referred to as "the pfi -# media") and have that media inserted or attached to the computer while -# you boot from the installer CD-ROM. The installer will attempt to -# locate this file and, if found, will use the variables present within it -# to configure the installer boot process. - -# This file has the same syntax as /etc/rc.conf, and it can contain any -# setting which is meaningful in /etc/rc.conf as well. Any rc.conf -# setting which is given will only be obeyed, however, if the RCNG script -# to which that setting applies is named in pfi_rc_actions. - -# EXAMPLE 1: -# Boot the installer headless, configure the network interface dc0, -# and start the CGI frontend. -# -# ifconfig_dc0="DHCP" -# pfi_rc_actions="netif dhclient" -# pfi_frontend="cgi" -# pfi_autologin="installer" -# pfi_shutdown_command="shutdown -r now" - -# EXAMPLE 2: -# Boot the installer headless, configure the network interface rl0, -# and allow ssh'ing into the box as root with the password "sekrit". -# -# ifconfig_rl0="DHCP" -# pfi_sshd_permit_root_login="YES" -# pfi_set_root_password="sekrit" -# pfi_rc_actions="netif dhclient sshd" -# pfi_frontend="none" -# pfi_autologin="installer" -# 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" -- 2.41.0