Attachment #165716 for bug #206336

Lines 11-16 Link Here

(-)head/etc/freebsd-update.conf (+3 lines)
11	# performance.	11	# performance.
12	ServerName update.FreeBSD.org	12	ServerName update.FreeBSD.org
13		13
		14	# HTTP_PROXY, can be overwritten with setenv on the command line
		15	# HttpProxy proxy.your.domain:proxy_port
		16
14	# Components of the base system which should be kept updated.	17	# Components of the base system which should be kept updated.
15	Components src world kernel	18	Components src world kernel
16		19




CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE
    KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED
    BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES
    IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES
    HTTPPROXY"

# Set all the configuration options to "".
nullconfig () {

	fi
}

# Proxy, allow overwrite via setenv
config_HttpProxy () {
	if [ -n "${HTTP_PROXY}${http_proxy}" ]; then
		return 0
	elif [ -z ${HttpProxy} ]; then
		export HTTP_PROXY=$1
	else
		return 1
	fi
}

# When fetching upgrades, should we assume the user wants exactly the
# components listed in COMPONENTS, rather than trying to guess based on
# what's currently installed?

Return to bug 206336

Lines 93-99 Link Here

(-)head/usr.sbin/freebsd-update/freebsd-update.sh (-1 / +13 lines)
93	CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE	93	CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE
94	KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED	94	KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED
95	BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES	95	BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES
96	IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES"	96	IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES
		97	HTTPPROXY"
97		98
98	# Set all the configuration options to "".	99	# Set all the configuration options to "".
99	nullconfig () {	100	nullconfig () {
Lines 269-274 Link Here
269	fi	270	fi
270	}	271	}
271		272
		273	# Proxy, allow overwrite via setenv
		274	config_HttpProxy () {
		275	if [ -n "${HTTP_PROXY}${http_proxy}" ]; then
		276	return 0
		277	elif [ -z ${HttpProxy} ]; then
		278	export HTTP_PROXY=$1
		279	else
		280	return 1
		281	fi
		282	}
		283
272	# When fetching upgrades, should we assume the user wants exactly the	284	# When fetching upgrades, should we assume the user wants exactly the
273	# components listed in COMPONENTS, rather than trying to guess based on	285	# components listed in COMPONENTS, rather than trying to guess based on
274	# what's currently installed?	286	# what's currently installed?