[Midnightbsd-cvs] src [11765] trunk/etc/rc.d: update scripts

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jul 11 10:29:52 EDT 2018


Revision: 11765
          http://svnweb.midnightbsd.org/src/?rev=11765
Author:   laffer1
Date:     2018-07-11 10:29:52 -0400 (Wed, 11 Jul 2018)
Log Message:
-----------
update scripts

Modified Paths:
--------------
    trunk/etc/rc.d/Makefile
    trunk/etc/rc.d/NETWORKING
    trunk/etc/rc.d/SERVERS
    trunk/etc/rc.d/abi
    trunk/etc/rc.d/addswap
    trunk/etc/rc.d/adjkerntz

Added Paths:
-----------
    trunk/etc/rc.d/automountd

Removed Paths:
-------------
    trunk/etc/rc.d/encswap
    trunk/etc/rc.d/named

Modified: trunk/etc/rc.d/Makefile
===================================================================
--- trunk/etc/rc.d/Makefile	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/Makefile	2018-07-11 14:29:52 UTC (rev 11765)
@@ -2,67 +2,295 @@
 
 .include <bsd.own.mk>
 
-FILES=	DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \
-	abi accounting addswap adjkerntz amd \
-	apm apmd archdep atm1 atm2 atm3 auditd auditdistd \
-	bgfsck bluetooth bootparams bridge bsnmpd bthidd \
-	ccd cleanvar cleartmp cron \
-	ddb defaultroute devd devfs dhclient dhcp6c \
-	dmesg dumpon \
-	encswap \
-	faith firstboot fsck ftp-proxy ftpd \
-	gbde geli geli2 gptboot gssd \
-	hastd hcsecd \
-	hostapd hostid hostid_save hostname \
-	ipropd_master ipropd_slave inetd initrandom \
-	ip6addrctl ipfilter ipfs ipfw ipmon \
-	ipnat ipsec \
-	jail \
-	kadmind kdc keyserv kld kldxref kpasswdd \
-	ldconfig local localpkg lockd lpd \
-	mdnsd mdnsresponder mixer motd \
-	mountcritlocal mountcritremote mountlate \
-	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
-	named natd netif netoptions netwait \
-	newsyslog nfsclient nfscbd nfsd \
-	nfsuserd nisdomain nsswitch ntpd \
-	othermta \
-	pf pflog pfsync \
-	powerd power_profile ppp pppoed pwcheck \
+FILES=	DAEMON \
+	FILESYSTEMS \
+	LOGIN \
+	NETWORKING \
+	SERVERS \
+	abi \
+	addswap \
+	adjkerntz \
+	archdep \
+	atm1 \
+	atm2 \
+	atm3 \
+	auditd \
+	auditdistd \
+	bgfsck \
+	${_bluetooth} \
+	bridge \
+	${_bthidd} \
+	cleanvar \
+	cleartmp \
+	cron \
+	ctld \
+	ddb \
+	defaultroute \
+	devd \
+	devfs \
+	dhclient \
+	dhcp6c \
+	dmesg \
+	dumpon \
+	faith \
+	firstboot \
+	fsck \
+	gbde \
+	geli \
+	geli2 \
+	gptboot \
+	growfs \
+	gssd \
+	${_hcsecd} \
+	hostid \
+	hostid_save \
+	hostname \
+	initrandom \
+	ip6addrctl \
+	ipfilter \
+	ipfs \
+	ipfw \
+	ipmon \
+	ipnat \
+	ipsec \
+	${_ipxrouted} \
+	${_kadmind} \
+	${_kdc} \
+	${_kfd} \
+	kld \
+	kldxref \
+	${_kpasswdd} \
+	ldconfig \
+	local \
+	localpkg \
+	lockd \
+	mixer \
+	motd \
+	mountcritlocal \
+	mountcritremote \
+	mountlate \
+	mdconfig \
+	mdconfig2 \
+	mdnsd \
+	mdnsresponder \
+	mountd \
+	mroute6d \
+	mrouted \
+	msgs \
+	natd \
+	netif \
+	netoptions \
+	netwait \
+	newsyslog \
+	nfsclient \
+	nfscbd \
+	nfsd \
+	nfsuserd \
+	nisdomain \
+	${_nscd} \
+	nsswitch \
+	${_opensm} \
+	pf \
+	pflog \
+	pfsync \
+	postrandom \
+	ppp \
+	pppoed \
+	pwcheck \
 	quota \
-	random rarpd rctl rdate resolv rfcomm_pppd_server root \
-	route6d routed routing rpcbind rtadvd rtsold rwho \
-	savecore sdpd securelevel sendmail \
-	sensorsd serial sppp statd static_arp static_ndp stf swap1 \
-	syscons sysctl syslogd \
-	timed tmp \
+	random \
+	rarpd \
+	rctl \
+	rdate \
+	resolv \
+	rfcomm_pppd_server \
+	root \
+	route6d \
+	routing \
+	rpcbind \
+	rtadvd \
+	rtsold \
+	savecore \
+	sdpd \
+	securelevel \
+	serial \
+	sppp \
+	${_sshd} \
+	statd \
+	static_arp \
+	static_ndp \
+	stf \
+	swap \
+	swaplate \
+	sysctl \
+	syslogd \
+	tmp \
+	${_ubthidhci} \
 	ugidfw \
-	var virecover \
-	watchdogd wpa_supplicant \
-	ypbind yppasswdd ypserv \
-	ypset ypupdated ypxfrd \
-	zfs zvol
+	${_unbound} \
+	${_utx} \
+	var \
+	virecover \
+	watchdogd \
+	ypbind \
+	yppasswdd \
+	ypserv \
+	ypset \
+	ypupdated \
+	ypxfrd \
 
+.if ${MK_ACCT} != "no"
+FILES+=		accounting
+.endif
+
+.if ${MK_ACPI} != "no"
+FILES+=		power_profile
+.endif
+
+.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
+FILES+=		powerd
+.endif
+
+.if ${MK_AMD} != "no"
+FILES+=		amd
+.endif
+
+.if ${MK_APM} != "no"
+FILES+=	apm
+FILES+=	apmd
+.endif
+
+.if ${MK_AUTOFS} != "no"
+FILES+=		automount
+FILES+=		automountd
+FILES+=		autounmountd
+.endif
+
+.if ${MK_BLUETOOTH} != "no"
+_bluetooth=	bluetooth
+_bthidd=	bthidd
+_hcsecd=	hcsecd
+_ubthidhci=	ubthidhci
+.endif
+
+.if ${MK_BOOTPARAMD} != "no"
+FILES+=		bootparams
+.endif
+
+.if ${MK_BSNMP} != "no"
+FILES+=		bsnmpd
+.endif
+
+.if ${MK_CCD} != "no"
+FILES+=		ccd
+.endif
+
+.if ${MK_FTP} != "no"
+FILES+=		ftpd
+.endif
+
+.if ${MK_HAST} != "no"
+FILES+=		hastd
+.endif
+
 .if ${MK_IPX} != "no"
-FILES+=	ipxrouted
+_ipxrouted=	ipxrouted
 .endif
 
+.if ${MK_INETD} != "no"
+FILES+=		inetd
+.endif
+
+.if ${MK_ISCSI} != "no"
+FILES+=		iscsictl
+FILES+=		iscsid
+.endif
+
+.if ${MK_JAIL} != "no"
+FILES+=		jail
+.endif
+
+.if ${MK_KERBEROS} != "no"
+FILES+=		ipropd_master
+FILES+=		ipropd_slave
+_kadmind=	kadmind
+_kdc=		kdc
+_kfd=		kfd
+_kpasswdd=	kpasswdd
+.endif
+
+.if ${MK_LEGACY_CONSOLE} != "no"
+FILES+=		moused
+FILES+=		syscons
+.endif
+
+.if ${MK_LPR} != "no"
+FILES+=		lpd
+.endif
+
+.if ${MK_MAIL} != "no"
+FILES+=		othermta
+.endif
+
+.if ${MK_NS_CACHING} != "no"
+_nscd=		nscd
+.endif
+
+.if ${MK_NTP} != "no"
+FILES+=		ntpd
+.endif
+
 .if ${MK_OFED} != "no"
-FILES+= opensm
+_opensm=	opensm
 .endif
 
+.if ${MK_OPENSSL} != "no"
+FILES+=		keyserv
+.endif
+
 .if ${MK_OPENSSH} != "no"
-FILES+=	sshd
+_sshd=		sshd
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-FILES+= nscd
+.if ${MK_PF} != "no"
+FILES+=		ftp-proxy
 .endif
 
-.if ${MK_BLUETOOTH} != "no"
-FILES+=	ubthidhci
+.if ${MK_RCMDS} != "no"
+FILES+=		rwho
 .endif
 
+.if ${MK_ROUTED} != "no"
+FILES+=		routed
+.endif
+
+.if ${MK_SENDMAIL} != "no"
+FILES+=		sendmail
+.endif
+
+.if ${MK_TIMED} != "no"
+FILES+=		timed
+.endif
+
+.if ${MK_UNBOUND} != "no"
+_unbound=	local_unbound
+.endif
+
+.if ${MK_UTMPX} != "no"
+_utx=		utx
+.endif
+
+.if ${MK_WIRELESS} != "no"
+FILES+=		hostapd
+FILES+=		wpa_supplicant
+.endif
+
+.if ${MK_ZFS} != "no"
+FILES+=		zfs
+FILES+=		zfsbe
+FILES+=		zvol
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 

Modified: trunk/etc/rc.d/NETWORKING
===================================================================
--- trunk/etc/rc.d/NETWORKING	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/NETWORKING	2018-07-11 14:29:52 UTC (rev 11765)
@@ -1,11 +1,10 @@
 #!/bin/sh
 #
 # $MidnightBSD$
-#
 
 # PROVIDE: NETWORKING NETWORK
-# REQUIRE: netif netoptions routing ppp ipfw stf faith
-# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge
+# REQUIRE: netif netwait netoptions routing ppp ipfw stf faith
+# REQUIRE: defaultroute mrouted route6d mroute6d resolv bridge
 # REQUIRE: static_arp static_ndp
 
 #	This is a dummy dependency, for services which require networking

Modified: trunk/etc/rc.d/SERVERS
===================================================================
--- trunk/etc/rc.d/SERVERS	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/SERVERS	2018-07-11 14:29:52 UTC (rev 11765)
@@ -1,9 +1,10 @@
 #!/bin/sh
 #
 # $MidnightBSD$
+#
 
 # PROVIDE: SERVERS
-# REQUIRE: mountcritremote abi ldconfig savecore watchdogd kdc
+# REQUIRE: mountcritremote abi ldconfig savecore watchdogd
 
 #	This is a dummy dependency, for early-start servers relying on
 #	some basic configuration.

Modified: trunk/etc/rc.d/abi
===================================================================
--- trunk/etc/rc.d/abi	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/abi	2018-07-11 14:29:52 UTC (rev 11765)
@@ -27,6 +27,11 @@
 
 	echo -n ' linux'
 	load_kld -e 'linux(aout|elf)' linux
+	case `sysctl -n hw.machine_arch` in
+	amd64)
+		load_kld -e 'linux64elf' linux64
+		;;
+	esac
 	if [ -x /compat/linux/sbin/ldconfigDisabled ]; then
 		_tmpdir=`mktemp -d -t linux-ldconfig`
 		/compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache

Modified: trunk/etc/rc.d/addswap
===================================================================
--- trunk/etc/rc.d/addswap	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/addswap	2018-07-11 14:29:52 UTC (rev 11765)
@@ -13,22 +13,12 @@
 . /etc/rc.subr
 
 name="addswap"
-start_cmd="addswap_start"
+start_cmd=":"
 stop_cmd=":"
+rcvar=
 
-addswap_start()
-{
-	case ${swapfile} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		if [ -w "${swapfile}" ]; then
-			echo "Adding ${swapfile} as additional swap"
-			mdev=`mdconfig -a -t vnode -f ${swapfile}` && swapon /dev/${mdev}
-		fi
-		;;
-	esac
-}
+set_rcvar_obsolete swapfile
+set_rcvar_obsolete geli_swap_flags
 
 load_rc_config $name
 run_rc_command "$1"

Modified: trunk/etc/rc.d/adjkerntz
===================================================================
--- trunk/etc/rc.d/adjkerntz	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/adjkerntz	2018-07-11 14:29:52 UTC (rev 11765)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: adjkerntz
-# REQUIRE: FILESYSTEMS random
+# REQUIRE: FILESYSTEMS postrandom
 # BEFORE: netif
 # KEYWORD: nojail
 

Added: trunk/etc/rc.d/automountd
===================================================================
--- trunk/etc/rc.d/automountd	                        (rev 0)
+++ trunk/etc/rc.d/automountd	2018-07-11 14:29:52 UTC (rev 11765)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $MidnightBSD$
+#
+
+# PROVIDE: automountd
+# REQUIRE: DAEMON
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="automountd"
+rcvar="autofs_enable"
+pidfile="/var/run/${name}.pid"
+command="/usr/sbin/${name}"
+required_modules="autofs"
+
+load_rc_config $name
+run_rc_command "$1"


Property changes on: trunk/etc/rc.d/automountd
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Deleted: trunk/etc/rc.d/encswap
===================================================================
--- trunk/etc/rc.d/encswap	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/encswap	2018-07-11 14:29:52 UTC (rev 11765)
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# $MidnightBSD$
-#
-
-# PROVIDE: disks
-# REQUIRE: initrandom
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="encswap"
-start_cmd="encswap_attach"
-stop_cmd="encswap_detach"
-
-encswap_attach()
-{
-	while read device mountpoint type options rest ; do
-		case ":${device}:${type}:${options}" in
-		:#*)
-			continue
-			;;
-		*.bde:swap:sw)
-			passphrase=`dd if=/dev/random count=1 2>/dev/null | md5 -q`
-			device="${device%.bde}"
-			gbde init "${device}" -P "${passphrase}" || return 1
-			gbde attach "${device}" -p "${passphrase}" || return 1
-			;;
-		*.eli:swap:sw)
-			device="${device%.eli}"
-			geli onetime ${geli_swap_flags} "${device}" || return 1
-			;;
-		esac
-	done < /etc/fstab
-}
-
-encswap_detach()
-{
-	while read device mountpoint type options rest ; do
-		case ":${device}:${type}:${options}" in
-		:#*)
-			continue
-			;;
-		*.bde:swap:sw)
-			device="${device%.bde}"
-			gbde detach "${device}"
-			;;
-		*.eli:swap:sw)
-			# Nothing here, because geli swap devices should be
-			# created with the auto-detach-on-last-close option.
-			;;
-		esac
-	done < /etc/fstab
-}
-
-load_rc_config $name
-run_rc_command "$1"

Deleted: trunk/etc/rc.d/named
===================================================================
--- trunk/etc/rc.d/named	2018-07-11 14:24:01 UTC (rev 11764)
+++ trunk/etc/rc.d/named	2018-07-11 14:29:52 UTC (rev 11765)
@@ -1,301 +0,0 @@
-#!/bin/sh
-#
-# $MidnightBSD$
-#
-
-# PROVIDE: named
-# REQUIRE: SERVERS FILESYSTEMS
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="named"
-rcvar=named_enable
-
-extra_commands="reload"
-
-start_precmd="named_prestart"
-start_postcmd="named_poststart"
-reload_cmd="named_reload"
-stop_cmd="named_stop"
-stop_postcmd="named_poststop"
-
-# If running in a chroot cage, ensure that the appropriate files
-# exist inside the cage, as well as helper symlinks into the cage
-# from outside.
-#
-# As this is called after the is_running and required_dir checks
-# are made in run_rc_command(), we can safely assume ${named_chrootdir}
-# exists and named isn't running at this point (unless forcestart
-# is used).
-#
-chroot_autoupdate()
-{
-	local file
-
-	# Create (or update) the chroot directory structure
-	#
-	if [ -r /etc/mtree/BIND.chroot.dist ]; then
-		mtree -deU -f /etc/mtree/BIND.chroot.dist \
-		    -p ${named_chrootdir}
-	else
-		warn "/etc/mtree/BIND.chroot.dist missing,"
-		warn "chroot directory structure not updated"
-	fi
-
-	# Create (or update) the configuration directory symlink
-	#
-	if [ ! -L "${named_conf%/*}" ]; then
-		if [ -d "${named_conf%/*}" ]; then
-			warn "named chroot: ${named_conf%/*} is a directory!"
-		elif [ -e "${named_conf%/*}" ]; then
-			warn "named chroot: ${named_conf%/*} exists!"
-		else
-			ln -s ${named_confdir} ${named_conf%/*}
-		fi
-	else
-		# Make sure it points to the right place.
-		ln -shf ${named_confdir} ${named_conf%/*}
-	fi
-
-	# Mount a devfs in the chroot directory if needed
-	#
-	if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
-		umount ${named_chrootdir}/dev 2>/dev/null
-		devfs_domount ${named_chrootdir}/dev devfsrules_hide_all
-		devfs -m ${named_chrootdir}/dev rule apply path null unhide
-		devfs -m ${named_chrootdir}/dev rule apply path random unhide
-	else
-		if [ -c ${named_chrootdir}/dev/null -a \
-		    -c ${named_chrootdir}/dev/random ]; then
-			info "named chroot: using pre-mounted devfs."
-		else
-			err 1 "named chroot: devfs cannot be mounted from" \
-			    "within a jail. Thus a chrooted named cannot" \
-			    "be run from within a jail." \
-			    "To run named without chrooting it, set" \
-			    "named_chrootdir=\"\" in /etc/rc.conf."
-		fi
-	fi
-
-	# Copy and/or update key files to the chroot /etc
-	#
-	for file in localtime protocols services; do
-		if [ -r /etc/$file ]; then
-			cmp -s /etc/$file "${named_chrootdir}/etc/$file" ||
-			    cp -p /etc/$file "${named_chrootdir}/etc/$file"
-		fi
-	done
-}
-
-# Make symlinks to the correct pid file
-#
-make_symlinks()
-{
-	checkyesno named_symlink_enable &&
-	    ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
-}
-
-named_poststart () {
-	make_symlinks
-
-	if checkyesno named_wait; then
-		until ${command%/sbin/named}/bin/host $named_wait_host >/dev/null 2>&1; do
-			echo "	Waiting for nameserver to resolve $named_wait_host"
-			sleep 1
-		done
-	fi
-}
-
-named_reload()
-{
-	${command%/named}/rndc reload
-}
-
-find_pidfile()
-{
-	if get_pidfile_from_conf pid-file $named_conf; then
-		pidfile="$_pidfile_from_conf"
-	else
-		pidfile="/var/run/named/pid"
-	fi
-}
-
-named_stop()
-{
-	find_pidfile
-
-	# This duplicates an undesirably large amount of code from the stop
-	# routine in rc.subr in order to use rndc to shut down the process,
-	# and to give it a second chance in case rndc fails.
-	rc_pid=$(check_pidfile $pidfile $command)
-	if [ -z "$rc_pid" ]; then
-		[ -n "$rc_fast" ] && return 0
-		_run_rc_notrunning
-		return 1
-	fi
-	echo 'Stopping named.'
-	if ${command%/named}/rndc stop 2>/dev/null; then
-		wait_for_pids $rc_pid
-	else
-		echo -n 'rndc failed, trying kill: '
-		kill -TERM $rc_pid
-		wait_for_pids $rc_pid
-  	fi
-}
-
-named_poststop()
-{
-	if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then
-		if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
-			umount ${named_chrootdir}/dev 2>/dev/null || true
-		else
-			warn "named chroot:" \
-			    "cannot unmount devfs from inside jail!"
-		fi
-	fi
-}
-
-create_file () {
-	if [ -e "$1" ]; then
-		unlink $1
-	fi
-	> $1
-	chown root:wheel $1
-	chmod 644 $1
-}
-
-named_prestart()
-{
-	find_pidfile
-
-	if [ -n "$named_pidfile" ]; then
-		warn 'named_pidfile: now determined from the conf file'
-	fi
-
-	command_args="-u ${named_uid:=root}"
-
-	if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then
-		case "$named_flags" in
-		-c*|*' -c'*) ;;		# No need to add it
-		*) command_args="-c $named_conf $command_args" ;;
-		esac
-	fi
-
-	local line nsip firstns
-
-	# Is the user using a sandbox?
-	#
-	if [ -n "$named_chrootdir" ]; then
-		rc_flags="$rc_flags -t $named_chrootdir"
-		checkyesno named_chroot_autoupdate && chroot_autoupdate
-	else
-		named_symlink_enable=NO
-	fi
-
-	# Create an rndc.key file for the user if none exists
-	#
-	confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
-	    -c ${named_confdir}/rndc.key"
-	if [ -s "${named_confdir}/rndc.conf" ]; then
-		unset confgen_command
-	fi
-	if [ -s "${named_confdir}/rndc.key" ]; then
-		case `stat -f%Su ${named_confdir}/rndc.key` in
-		root|$named_uid) ;;
-		*) $confgen_command ;;
-		esac
-	else
-		$confgen_command
-	fi
-
-	local checkconf
-
-	checkconf="${command%/named}/named-checkconf"
-	if ! checkyesno named_chroot_autoupdate && [ -n "$named_chrootdir" ]; then
-		checkconf="$checkconf -t $named_chrootdir"
-	fi
-
-	# Create a forwarder configuration based on /etc/resolv.conf
-	if checkyesno named_auto_forward; then
-		if [ ! -s /etc/resolv.conf ]; then
-			warn "named_auto_forward enabled, but no /etc/resolv.conf"
-
-			# Empty the file in case it is included in named.conf
-			[ -s "${named_confdir}/auto_forward.conf" ] &&
-			    create_file ${named_confdir}/auto_forward.conf
-
-			$checkconf $named_conf ||
-			    err 3 'named-checkconf for $named_conf failed'
-			return
-		fi
-
-		create_file /var/run/naf-resolv.conf
-		create_file /var/run/auto_forward.conf
-
-		echo '	forwarders {' > /var/run/auto_forward.conf
-
-		while read line; do
-			case "$line" in
-			'nameserver '*|'nameserver	'*)
-				nsip=${line##nameserver[         ]}
-
-				if [ -z "$firstns" ]; then
-					if [ ! "$nsip" = '127.0.0.1' ]; then
-						echo 'nameserver 127.0.0.1'
-						echo "		${nsip};" >> /var/run/auto_forward.conf
-					fi
-
-					firstns=1
-				else
-					[ "$nsip" = '127.0.0.1' ] && continue
-					echo "		${nsip};" >> /var/run/auto_forward.conf
-				fi
-				;;
-			esac
-
-			echo $line
-		done < /etc/resolv.conf > /var/run/naf-resolv.conf
-
-		echo '	};' >> /var/run/auto_forward.conf
-		echo '' >> /var/run/auto_forward.conf
-		if checkyesno named_auto_forward_only; then
-			echo "	forward only;" >> /var/run/auto_forward.conf
-		else
-			echo "	forward first;" >> /var/run/auto_forward.conf
-		fi
-
-		if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then
-			unlink /var/run/naf-resolv.conf
-		else
-			[ -e /etc/resolv.conf ] && unlink /etc/resolv.conf
-			mv /var/run/naf-resolv.conf /etc/resolv.conf
-		fi
-
-		if cmp -s ${named_confdir}/auto_forward.conf \
-		    /var/run/auto_forward.conf; then
-			unlink /var/run/auto_forward.conf
-		else
-			[ -e "${named_confdir}/auto_forward.conf" ] &&
-			    unlink ${named_confdir}/auto_forward.conf
-			mv /var/run/auto_forward.conf \
-			    ${named_confdir}/auto_forward.conf
-		fi
-	else
-		# Empty the file in case it is included in named.conf
-		[ -s "${named_confdir}/auto_forward.conf" ] &&
-		    create_file ${named_confdir}/auto_forward.conf
-	fi
-
-	$checkconf $named_conf || err 3 'named-checkconf for $named_conf failed'
-}
-
-load_rc_config $name
-
-# Updating the following variables requires that rc.conf be loaded first
-#
-required_dirs="$named_chrootdir"	# if it is set, it must exist
-
-named_confdir="${named_chrootdir}${named_conf%/*}"
-
-run_rc_command "$1"



More information about the Midnightbsd-cvs mailing list