Attachment 16717 Details for Bug 30546 – file.diff

[patch] file.diff

file.diff (text/plain), 20.08 KB, created by Tony Finch on 2001-09-13 03:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Finch

Created: 2001-09-13 03:50:00 UTC

Size: 20.08 KB

patch

obsolete

>Index: pccard_ether
>===================================================================
>RCS file: /home/ncvs/src/etc/pccard_ether,v
>retrieving revision 1.15.2.9
>diff -u -r1.15.2.9 pccard_ether
>--- pccard_ether	2001/08/24 19:47:05	1.15.2.9
>+++ pccard_ether	2001/09/13 03:23:47
>@@ -21,15 +21,11 @@
> 
> start_dhcp() {
> 	stop_dhcp
>-	if [ -x "${dhcp_program}" ]; then
>-		if [ `basename ${dhcp_program}` = "dhclient" ]; then
>-			pidfile="/var/run/dhclient.${interface}.pid"
>-			dhcp_flags="${dhcp_flags} -pf ${pidfile}"
>-		fi
>-		${dhcp_program} ${dhcp_flags} ${interface}
>-	else
>-		echo "${dhcp_program}: DHCP client software not available"
>+	if [ `basename ${dhcp_program}` = "dhclient" ]; then
>+		pidfile="/var/run/dhclient.${interface}.pid"
>+		dhcp_flags="${dhcp_flags} -pf ${pidfile}"
> 	fi
>+	${dhcp_program} ${dhcp_flags} ${interface}
> }
> 
> # Suck in the configuration variables
>Index: rc
>===================================================================
>RCS file: /home/ncvs/src/etc/rc,v
>retrieving revision 1.212.2.34
>diff -u -r1.212.2.34 rc
>--- rc	2001/08/01 19:59:05	1.212.2.34
>+++ rc	2001/09/13 03:20:44
>@@ -58,7 +58,7 @@
> # to setup diskless on the client and the server.
> #
> if [ -r /etc/rc.diskless1 ]; then
>-	dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
>+	dlv=`sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
> 	if [ ${dlv:=0} != 0 ]; then
> 		. /etc/rc.diskless1
> 	fi
>@@ -365,7 +365,7 @@
> 
> 	rm -f /var/run/log
> 	echo -n ' syslogd';
>-	${syslogd_program:-/usr/sbin/syslogd} ${syslogd_flags}
>+	${syslogd_program:-syslogd} ${syslogd_flags}
> 	;;
> esac
> 
>@@ -384,9 +384,9 @@
> 	;;
> *)
> 	if [ -e "${dumpdev}" -a -d /var/crash ]; then
>-		/sbin/dumpon -v ${dumpdev}
>+		dumpon -v ${dumpdev}
> 		echo -n 'Checking for core dump: '
>-		/sbin/savecore ${savecore_flags} /var/crash
>+		savecore ${savecore_flags} /var/crash
> 	fi
> 	;;
> esac
>@@ -439,42 +439,40 @@
> # Make shared lib searching a little faster.  Leave /usr/lib first if you
> # add your own entries or you may come to grief.
> #
>-ldconfig="/sbin/ldconfig"
>+ldconfig="ldconfig"
> case ${ldconfig_insecure} in
> [Yy][Ee][Ss])
> 	ldconfig="${ldconfig} -i"
> 	;;
> esac
>-if [ -x /sbin/ldconfig ]; then
>-	case `/usr/bin/objformat` in
>-	elf)
>-		_LDC=/usr/lib
>-		for i in ${ldconfig_paths}; do
>-			if [ -d "${i}" ]; then
>-				_LDC="${_LDC} ${i}"
>-			fi
>-		done
>-		echo 'ELF ldconfig path:' ${_LDC}
>-		${ldconfig} -elf ${_LDC}
>-		;;
>-	esac
>+case `objformat` in
>+elf)
>+	_LDC=/usr/lib
>+	for i in ${ldconfig_paths}; do
>+		if [ -d "${i}" ]; then
>+			_LDC="${_LDC} ${i}"
>+		fi
>+	done
>+	echo 'ELF ldconfig path:' ${_LDC}
>+	${ldconfig} -elf ${_LDC}
>+	;;
>+esac
> 
>-	# Legacy aout support for i386 only
>-	case `sysctl -n hw.machine` in
>-	i386)
>-		# Default the a.out ldconfig path.
>-		: ${ldconfig_paths_aout=${ldconfig_paths}}
>-		_LDC=/usr/lib/aout
>-		for i in ${ldconfig_paths_aout}; do
>-			if [ -d "${i}" ]; then
>-				_LDC="${_LDC} ${i}"
>-			fi
>-		done
>-		echo 'a.out ldconfig path:' ${_LDC}
>-		${ldconfig} -aout ${_LDC}
>-		;;
>-	esac
>-fi
>+# Legacy aout support for i386 only
>+case `sysctl -n hw.machine` in
>+i386)
>+	# Default the a.out ldconfig path.
>+	: ${ldconfig_paths_aout=${ldconfig_paths}}
>+	_LDC=/usr/lib/aout
>+	for i in ${ldconfig_paths_aout}; do
>+		if [ -d "${i}" ]; then
>+			_LDC="${_LDC} ${i}"
>+		fi
>+	done
>+	echo 'a.out ldconfig path:' ${_LDC}
>+	${ldconfig} -aout ${_LDC}
>+	;;
>+esac
> 
> # Now start up miscellaneous daemons that don't belong anywhere else
> #
>@@ -483,7 +481,7 @@
> [Nn][Oo])
> 	;;
> *)
>-	echo -n ' inetd'; ${inetd_program:-/usr/sbin/inetd} ${inetd_flags}
>+	echo -n ' inetd';	${inetd_program:-inetd} ${inetd_flags}
> 	;;
> esac
> 
>@@ -491,47 +489,41 @@
> [Nn][Oo])
> 	;;
> *)
>-	echo -n ' cron';	${cron_program:-/usr/sbin/cron} ${cron_flags}
>+	echo -n ' cron';	${cron_program:-cron} ${cron_flags}
> 	;;
> esac
> 
> case ${lpd_enable} in
> [Yy][Ee][Ss])
>-	echo -n ' printer';	${lpd_program:-/usr/sbin/lpd} ${lpd_flags}
>+	echo -n ' printer';	${lpd_program:-lpd} ${lpd_flags}
> 	;;
> esac
> 
> case ${sshd_enable} in
> [Yy][Ee][Ss])
>-	if [ -x ${sshd_program:-/usr/sbin/sshd} ]; then
>-		echo -n ' sshd';
>-		${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
>-	fi
>+	echo -n ' sshd';	${sshd_program:-sshd} ${sshd_flags}
> 	;;
> esac
> 
> case ${usbd_enable} in
> [Yy][Ee][Ss])
>-	echo -n ' usbd';	/usr/sbin/usbd ${usbd_flags}
>+	echo -n ' usbd';	usbd ${usbd_flags}
> 	;;
> esac
> 
>-if [ -r /etc/mail/sendmail.cf ]; then
>-	case ${sendmail_enable} in
>+case ${sendmail_enable} in
>+[Yy][Ee][Ss])
>+	echo -n ' sendmail';	sendmail ${sendmail_flags}
>+	;;
>+*)
>+	case ${sendmail_outbound_enable} in
> 	[Yy][Ee][Ss])
> 		echo -n ' sendmail'
>-		/usr/sbin/sendmail ${sendmail_flags}
>-		;;
>-	*)
>-		case ${sendmail_outbound_enable} in
>-		[Yy][Ee][Ss])
>-			echo -n ' sendmail'
>-			/usr/sbin/sendmail ${sendmail_outbound_flags}
>-			;;
>-		esac
>+		sendmail ${sendmail_outbound_flags}
> 		;;
> 	esac
>-fi
>+	;;
>+esac
> 
> echo '.'
> 
>Index: rc.diskless1
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.diskless1,v
>retrieving revision 1.5.2.6
>diff -u -r1.5.2.6 rc.diskless1
>--- rc.diskless1	2001/05/11 17:46:57	1.5.2.6
>+++ rc.diskless1	2001/09/13 03:24:13
>@@ -63,7 +63,7 @@
> }
> 
> mount_md() {
>-	/sbin/mount_mfs -s $1 -T qp120at dummy $2
>+	mount_mfs -s $1 -T qp120at dummy $2
> }
> 
> # DEBUGGING
>@@ -99,9 +99,9 @@
> 
> mount_md 4096 /etc 0
> chkerr $? "MFS mount on /etc"
>-/bin/chmod 755 /etc
>+chmod 755 /etc
> 
>-/bin/cp -Rp /conf/default/etc/* /etc
>+cp -Rp /conf/default/etc/* /etc
> chkerr $? "cp /conf/default/etc to /etc MFS"
> 
> # Allow for override files to replace files in /etc.  Use /conf/*/etc
>Index: rc.diskless2
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.diskless2,v
>retrieving revision 1.5.2.8
>diff -u -r1.5.2.8 rc.diskless2
>--- rc.diskless2	2001/07/24 09:49:37	1.5.2.8
>+++ rc.diskless2	2001/09/13 03:24:44
>@@ -40,7 +40,7 @@
> 	if [ -n "$4" ]; then
> 		bpi="-i $4"
> 	fi
>-	/sbin/mount_mfs -s $1 -T qp120at $bpi dummy $2
>+	mount_mfs -s $1 -T qp120at $bpi dummy $2
> }
> 
> # If there is a global system configuration file, suck it in.
>@@ -56,12 +56,12 @@
> mount_md ${varsize:=65536} /var 1
> 
> echo "+++ populate /var using /etc/mtree/BSD.var.dist"
>-/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var
>+mtree -deU -f /etc/mtree/BSD.var.dist -p /var
> 
> echo "+++ create log files based on the contents of /etc/newsyslog.conf"
>-LOGFILES=`/usr/bin/awk '$1 != "#" { printf "%s ", $1 } ' /etc/newsyslog.conf`
>+LOGFILES=`awk '$1 != "#" { printf "%s ", $1 } ' /etc/newsyslog.conf`
> if [ -n "$LOGFILES" ]; then
>-	/usr/bin/touch $LOGFILES
>+	touch $LOGFILES
> fi
> 
> mount -a       # chown and chgrp are in /usr
>Index: rc.firewall
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.firewall,v
>retrieving revision 1.30.2.13
>diff -u -r1.30.2.13 rc.firewall
>--- rc.firewall	2001/08/17 21:03:29	1.30.2.13
>+++ rc.firewall	2001/09/13 03:25:02
>@@ -85,10 +85,10 @@
> #
> case ${firewall_quiet} in
> [Yy][Ee][Ss])
>-	fwcmd="/sbin/ipfw -q"
>+	fwcmd="ipfw -q"
> 	;;
> *)
>-	fwcmd="/sbin/ipfw"
>+	fwcmd="ipfw"
> 	;;
> esac
> 
>Index: rc.firewall6
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.firewall6,v
>retrieving revision 1.1.2.8
>diff -u -r1.1.2.8 rc.firewall6
>--- rc.firewall6	2001/08/29 09:57:12	1.1.2.8
>+++ rc.firewall6	2001/09/13 03:25:14
>@@ -58,10 +58,10 @@
> #
> case ${ipv6_firewall_quiet} in
> [Yy][Ee][Ss])
>-	fw6cmd="/sbin/ip6fw -q"
>+	fw6cmd="ip6fw -q"
> 	;;
> *)
>-	fw6cmd="/sbin/ip6fw"
>+	fw6cmd="ip6fw"
> 	;;
> esac
> 
>Index: rc.isdn
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.isdn,v
>retrieving revision 1.5.2.5
>diff -u -r1.5.2.5 rc.isdn
>--- rc.isdn	2001/05/22 18:46:53	1.5.2.5
>+++ rc.isdn	2001/09/13 03:28:02
>@@ -40,12 +40,10 @@
> 
> 	# Check for pcvt driver (VT100/VT220 emulator)
> 	#
>-	if [ -x /usr/sbin/ispcvt ]; then
>-		if /usr/sbin/ispcvt; then
>-			# No vidcontrol if we are using pcvt
>-			#
>-			isdn_screenflags=NO
>-		fi
>+	if ispcvt; then
>+		# No vidcontrol if we are using pcvt
>+		#
>+		isdn_screenflags=NO
> 	fi
> 
> 	case ${isdn_flags} in
>@@ -56,38 +54,32 @@
> 
> 	# Start the isdn daemon
> 	#
>-	if [ -x /usr/sbin/isdnd ]; then
>-		echo -n ' isdnd'
>-		case ${isdn_fsdev} in
>-		[Nn][Oo] | '')
>-			/usr/sbin/isdnd ${isdn_flags}
>+	echo -n ' isdnd'
>+	case ${isdn_fsdev} in
>+	[Nn][Oo] | '')
>+		isdnd ${isdn_flags}
>+		;;
>+	*)
>+		# Change vidmode of ${isdn_fsdev}
>+		#
>+		case ${isdn_screenflags} in
>+		[Nn][Oo])
> 			;;
> 		*)
>-			# Change vidmode of ${isdn_fsdev}
>-			#
>-			case ${isdn_screenflags} in
>-			[Nn][Oo])
>-				;;
>-			*)
>-				if [ -x /usr/sbin/vidcontrol ]; then
>-					/usr/sbin/vidcontrol < ${isdn_fsdev} > ${isdn_fsdev} 2>&1 ${isdn_screenflags}
>-				fi
>-				;;
>-			esac
>-
>-			/usr/sbin/isdnd ${isdn_flags} -f -r ${isdn_fsdev} -t ${isdn_ttype}
>+			vidcontrol < ${isdn_fsdev} > ${isdn_fsdev} 2>&1 ${isdn_screenflags}
> 			;;
> 		esac
>-	fi
>+
>+		isdnd ${isdn_flags} -f -r ${isdn_fsdev} -t ${isdn_ttype}
>+		;;
>+	esac
> 
> 	# Start isdntrace
> 	#
> 	case ${isdn_trace} in
> 	[Yy][Ee][Ss])
>-		if [ -x /usr/sbin/isdntrace ]; then
>-			echo -n ' isdntrace'
>-			nohup /usr/sbin/isdntrace ${isdn_traceflags} >/dev/null 2>&1 &
>-		fi
>+		echo -n ' isdntrace'
>+		nohup isdntrace ${isdn_traceflags} >/dev/null 2>&1 &
> 		;;
> 	esac
> 
>Index: rc.network
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.network,v
>retrieving revision 1.74.2.23
>diff -u -r1.74.2.23 rc.network
>--- rc.network	2001/08/17 07:26:38	1.74.2.23
>+++ rc.network	2001/09/13 03:29:18
>@@ -48,7 +48,7 @@
> 	# Establish ipfilter ruleset as early as possible (best in
> 	# addition to IPFILTER_DEFAULT_BLOCK in the kernel config file)
> 	#
>-	if /sbin/ipfstat -i > /dev/null 2>&1; then
>+	if ipfstat -i > /dev/null 2>&1; then
> 		ipfilter_in_kernel=1
> 	else
> 		ipfilter_in_kernel=0
>@@ -65,19 +65,19 @@
> 
> 		if [ -r "${ipfilter_rules}" ]; then
> 			echo -n ' ipfilter';
>-			${ipfilter_program:-/sbin/ipf -Fa -f} \
>+			${ipfilter_program:-ipf -Fa -f} \
> 			    "${ipfilter_rules}" ${ipfilter_flags}
> 			case "${ipmon_enable}" in
> 			[Yy][Ee][Ss])
> 				echo -n ' ipmon'
>-				${ipmon_program:-/sbin/ipmon} ${ipmon_flags}
>+				${ipmon_program:-ipmon} ${ipmon_flags}
> 				;;
> 			esac
> 			case "${ipnat_enable}" in
> 			[Yy][Ee][Ss])
> 				if [ -r "${ipnat_rules}" ]; then
> 					echo -n ' ipnat';
>-				eval ${ipnat_program:-/sbin/ipnat -CF -f} \
>+				eval ${ipnat_program:-ipnat -CF -f} \
> 					"${ipnat_rules}" ${ipnat_flags}
> 				else
> 					echo -n ' NO IPNAT RULES'
>@@ -175,7 +175,7 @@
> 	done
> 
> 	if [ ! -z "${dhcp_interfaces}" ]; then
>-		${dhcp_program:-/sbin/dhclient} ${dhcp_flags} ${dhcp_interfaces}
>+		${dhcp_program:-dhclient} ${dhcp_flags} ${dhcp_interfaces}
> 	fi
> 
> 	for ifn in ${network_interfaces}; do
>@@ -231,7 +231,7 @@
> 			ppp_mode="auto"
> 		fi
> 
>-		ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
>+		ppp_command="ppp -quiet -${ppp_mode}"
> 
> 		# Switch on NAT mode?
> 		#
>@@ -250,7 +250,7 @@
> 
> 	# Initialize IP filtering using ipfw
> 	#
>-	if /sbin/ipfw -q flush > /dev/null 2>&1; then
>+	if ipfw -q flush > /dev/null 2>&1; then
> 		firewall_in_kernel=1
> 	else
> 		firewall_in_kernel=0
>@@ -286,14 +286,15 @@
> 				case ${natd_enable} in
> 				[Yy][Ee][Ss])
> 					if [ -n "${natd_interface}" ]; then
>-						if echo ${natd_interface} | \
>-							grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then
>+						if echo ${natd_interface} |
>+							egrep -q '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then
> 							natd_ifarg="-a ${natd_interface}"
> 						else
> 							natd_ifarg="-n ${natd_interface}"
> 						fi
> 
>-						echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg}
>+						echo -n ' natd'
>+						${natd_program:-natd} ${natd_flags} ${natd_ifarg}
> 					fi
> 					;;
> 				esac
>@@ -518,7 +519,7 @@
> 
> 	case ${portmap_enable} in
> 	[Yy][Ee][Ss])
>-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
>+		echo -n ' portmap';	${portmap_program:-portmap} ${portmap_flags}
> 		;;
> 	esac
> 
>@@ -744,11 +745,11 @@
> 	[Yy][Ee][Ss])
> 		if [ ! -f /etc/ssh/ssh_host_key ]; then
> 			echo ' creating ssh RSA host key';
>-			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
>+			ssh-keygen -N "" -f /etc/ssh/ssh_host_key
> 		fi
> 		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
> 			echo ' creating ssh DSA host key';
>-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
>+			ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
> 		fi
> 		;;
> 	esac
>Index: rc.network6
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.network6,v
>retrieving revision 1.5.2.18
>diff -u -r1.5.2.18 rc.network6
>--- rc.network6	2001/07/27 20:37:53	1.5.2.18
>+++ rc.network6	2001/09/13 03:29:30
>@@ -39,7 +39,7 @@
> 
> 	# Initialize IP filtering using ip6fw
> 	#
>-	if /sbin/ip6fw -q flush > /dev/null 2>&1; then
>+	if ip6fw -q flush > /dev/null 2>&1; then
> 		ipv6_firewall_in_kernel=1
> 	else
> 		ipv6_firewall_in_kernel=0
>Index: defaults/rc.conf
>===================================================================
>RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
>retrieving revision 1.53.2.39
>diff -u -r1.53.2.39 rc.conf
>--- defaults/rc.conf	2001/08/17 07:26:38	1.53.2.39
>+++ defaults/rc.conf	2001/09/13 03:34:20
>@@ -41,7 +41,7 @@
> ### Basic network and firewall/security options: ###
> hostname=""			# Set this!
> nisdomainname="NO"		# Set to NIS domain if using NIS (or NO).
>-dhcp_program="/sbin/dhclient"	# Path to dhcp client program.
>+dhcp_program="dhclient"		# Path to dhcp client program.
> dhcp_flags=""			# Additional flags to pass to dhcp client.
> firewall_enable="NO"		# Set to YES to enable firewall functionality
> firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall
>@@ -53,13 +53,12 @@
> ip_portrange_last="NO"		# Set last dynamically allocated port
> ipsec_enable="NO"		# Set to YES to run setkey on ipsec_file
> ipsec_file="/etc/ipsec.conf"	# Name of config file for setkey
>-natd_program="/sbin/natd"	# path to natd, if you want a different one.
>+natd_program="natd"		# path to natd, if you want a different one.
> natd_enable="NO"                # Enable natd (if firewall_enable == YES).
> natd_interface="fxp0"           # Public interface or IPaddress to use.
> natd_flags=""                   # Additional flags for natd.
> ipfilter_enable="NO"		# Set to YES to enable ipfilter functionality
>-ipfilter_program="/sbin/ipf -Fa -f"
>-				# program and how to specify the rules file,
>+ipfilter_program="ipf -Fa -f"	# program and how to specify the rules file,
> 				# see /etc/rc.network (pass1) for details
> ipfilter_rules="/etc/ipf.rules"	# rules definition file for ipfilter, see
> 				# /usr/src/contrib/ipfilter/rules for examples
>@@ -67,11 +66,11 @@
> 				# (i.e. compiled into the kernel) to
> 				# avoid a warning about "already initialized"
> ipnat_enable="NO"		# Set to YES for ipnat; needs ipfilter, too!
>-ipnat_program="/sbin/ipnat -CF -f" # program and how to specify rules file
>+ipnat_program="ipnat -CF -f"	# program and how to specify rules file
> ipnat_rules="/etc/ipnat.rules"	# rules definition file for ipnat
> ipnat_flags=""			# additional flags for ipnat
> ipmon_enable="NO"		# Set to YES for ipmon; needs ipfilter, too!
>-ipmon_program="/sbin/ipmon"	# where the ipfilter monitor program lives
>+ipmon_program="ipmon"		# where the ipfilter monitor program lives
> ipmon_flags="-Ds"		# typically "-Ds" or "-D /var/log/ipflog"
> tcp_extensions="YES"		# Set to NO to turn off RFC1323 extensions.
> log_in_vain="NO"		# YES to log connects to ports w/o listeners.
>@@ -108,10 +107,10 @@
> 
> ### Network daemon (miscellaneous) & NFS options: ###
> syslogd_enable="YES"		# Run syslog daemon (or NO).
>-syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
>+syslogd_program="syslogd"	# path to syslogd, if you want a different one.
> syslogd_flags="-s"		# Flags to syslogd (if enabled).
> inetd_enable="YES"		# Run the network daemon dispatcher (or NO).
>-inetd_program="/usr/sbin/inetd"	# path to inetd, if you want a different one.
>+inetd_program="inetd"		# path to inetd, if you want a different one.
> inetd_flags="-wW"		# Optional flags to inetd
> #
> # named.  It may be possible to run named in a sandbox, man security for
>@@ -147,8 +146,8 @@
> nfs_bufpackets="DEFAULT"	# bufspace (in packets) for client (or DEFAULT)
> rpc_lockd_enable="NO"		# Run NFS rpc.lockd (*broken!*) if nfs_server.
> rpc_statd_enable="YES"		# Run NFS rpc.statd if nfs_server (or NO).
>-portmap_enable="NO"		# Run the portmapper service (or NO).
>-portmap_program="/usr/sbin/portmap"	# path to portmap, if you want a different one.
>+portmap_enable="NO"		# Run the portmapper service (or YES).
>+portmap_program="portmap"	# path to portmap, if you want a different one.
> portmap_flags=""		# Flags to portmap (if enabled).
> rpc_ypupdated_enable="NO"	# Run if NIS master and SecureRPC (or NO).
> keyserv_enable="NO"		# Run the SecureRPC keyserver (or NO).
>@@ -162,7 +161,7 @@
> pppoed_flags="-P /var/run/pppoed.pid"	# Flags to pppoed (if enabled).
> pppoed_interface="fxp0"		# The interface that pppoed runs on.
> sshd_enable="NO"                # Enable sshd
>-sshd_program="/usr/sbin/sshd"	# path to sshd, if you want a different one.
>+sshd_program="sshd"		# path to sshd, if you want a different one.
> sshd_flags=""                   # Additional flags for sshd.
> 
> ### Network Time Services options: ###
>@@ -200,7 +199,7 @@
> ipxrouted_enable="NO"		# Set to YES to run the IPX routing daemon.
> ipxrouted_flags=""		# Flags for IPX routing daemon.
> arpproxy_all="NO"	       	# replaces obsolete kernel option ARP_PROXYALL.
>-forward_sourceroute="NO"	# do source routing (only if gateway_enable is set to "YES")
>+forward_sourceroute="NO"	# do source routing if gateway_enable is YES
> accept_sourceroute="NO"		# accept source routed packets to us
> 
> ### ATM interface options: ###
>@@ -236,7 +235,7 @@
> #ipv6_route_xxx="fec0:0000:0000:0006:: -prefixlen 64 ::1"
> ipv6_gateway_enable="NO"	# Set to YES if this host will be a gateway.
> ipv6_router_enable="NO"		# Set to YES to enable an IPv6 routing daemon.
>-ipv6_router="/usr/sbin/route6d"	# Name of IPv6 routing daemon.
>+ipv6_router="route6d"		# Name of IPv6 routing daemon.
> ipv6_router_flags=""		# Flags to IPv6 routing daemon.
> #ipv6_router_flags="-l"		# Example for route6d with only IPv6 site local
> 				# addrs.
>@@ -256,8 +255,7 @@
> 				# IPv6 default router for local subnets.
> rtadvd_interfaces=""		# Interfaces rtadvd sends RA packets.
> mroute6d_enable="NO"		# Do IPv6 multicast routing.
>-mroute6d_program="/usr/sbin/pim6dd"	# Name of IPv6 multicast routing
>-					# daemon.
>+mroute6d_program="pim6dd"	# Name of IPv6 multicast routing daemon.
> mroute6d_flags=""		# Flags to IPv6 multicast routing daemon.
> stf_interface_ipv4addr=""	# Local IPv4 addr for 6to4 IPv6 over IPv4
> 				# tunneling interface. Specify this entry
>@@ -312,19 +310,19 @@
> ##############################################################
> 
> cron_enable="YES"	# Run the periodic job daemon.
>-cron_program="/usr/sbin/cron" 	# Which cron executable to run (if enabled).
>+cron_program="cron" 	# Which cron executable to run (if enabled).
> cron_flags="" 		# Which options to pass to the cron daemon.
> lpd_enable="NO"		# Run the line printer daemon.
>-lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
>+lpd_program="lpd"	# path to lpd, if you want a different one.
> lpd_flags=""		# Flags to lpd (if enabled).
> usbd_enable="NO"	# Run the usbd daemon.
> usbd_flags=""		# Flags to usbd (if enabled).
> sendmail_enable="YES"	# Run the sendmail inbound daemon (or NO).
>-sendmail_flags="-bd -q30m" # Flags to sendmail (as a server)
>+sendmail_flags="-bd -q30m"	# Flags to sendmail (if enabled)
> sendmail_outbound_enable="NO"	# Dequeue stuck mail (or YES).
> sendmail_outbound_flags="-q30m" # Flags to sendmail (outbound only)
> dumpdev="NO"		# Device name to crashdump to (or NO).
>-savecore_flags="" 	# Used if dumpdev is enabled above, and present.
>+savecore_flags=""	# Used if dumpdev is enabled above, and present.
> enable_quotas="NO"      # turn on quotas on startup (or NO).
> check_quotas="YES"	# Check quotas on startup (or NO).
> accounting_enable="NO"	# Turn on process accounting (or NO).
>@@ -343,7 +341,7 @@
> kern_securelevel_enable="NO"	# kernel security level (see init(8)), 
> kern_securelevel="-1"	# range: -1..3 ; `-1' is the most insecure
> update_motd="YES"	# update version info in /etc/motd (or NO)
>-start_vinum="NO"       	# set to YES to start vinum
>+start_vinum="NO"	# set to YES to start vinum
> unaligned_print="YES"	# print unaligned access warnings on the alpha (or NO).
> 
> ##############################################################

Actions: View | Diff

Attachments on bug 30546: 16717