[gentoo-commits] gentoo-x86 commit in net-misc/dhcp/files: dhcpd.conf2 dhcpd.init4

[gentoo-commits] gentoo-x86 commit in net-misc/dhcp/files: dhcpd.conf2 dhcpd.init4

[Mike Frysinger (vapier)]

vapier      11/09/17 05:28:58

  Added:                dhcpd.conf2 dhcpd.init4
  Log:
  Rewrite chroot usage to work with newer versions #362535 by Andrew Savchenko.
  
  (Portage version: 2.2.0_alpha58/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/dhcp/files/dhcpd.conf2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcpd.conf2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcpd.conf2?rev=1.1&content-type=text/plain

Index: dhcpd.conf2
===================================================================
# /etc/conf.d/dhcpd: config file for /etc/init.d/dhcpd

# If you require more than one instance of dhcpd you can create symbolic
# links to dhcpd service like so
#   cd /etc/init.d
#   ln -s dhcpd dhcpd.foo
#   cd ../conf.d
#   cp dhcpd dhcpd.foo
# Now you can edit dhcpd.foo and specify a different configuration file.
# You'll also need to specify a pidfile in that dhcpd.conf file.
# See the pid-file-name option in the dhcpd.conf man page for details.

# If you wish to run dhcpd in a chroot, uncomment the following line
# DHCPD_CHROOT="/var/lib/dhcp/chroot"

# Then run emerge dhcp --config
# All file paths below are relative to the chroot.
# You can specify a different chroot directory but MAKE SURE it's empty.

# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf
# DHCPD_CONF="/etc/dhcp/dhcpd.conf"

# Configure which interface or interfaces to for dhcpd to listen on.
# List all interfaces space separated. If this is not specified then
# we listen on all interfaces.
# DHCPD_IFACE=""

# Insert any other dhcpd options - see the man page for a full list.
# DHCPD_OPTS=""



1.1                  net-misc/dhcp/files/dhcpd.init4

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcpd.init4?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcpd.init4?rev=1.1&content-type=text/plain

Index: dhcpd.init4
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init4,v 1.1 2011/09/17 05:28:58 vapier Exp $

opts="configtest"

: ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf}

depend() {
	need net
	use logger dns
}

get_var() {
	# we read the conf outside of the chroot as we do
	# not configure with --enable-early-chroot
	local var="$(sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' "${DHCPD_CONF}")"
	echo ${var:-$2}
}

checkconfig() {
	set -- ${DHCPD_OPTS} ${chroot:+-chroot} ${chroot} -t

	dhcpd "$@" 1>/dev/null 2>&1
	local ret=$?
	if [ ${ret} -ne 0 ] ; then
		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
		dhcpd "$@"
	fi

	return ${ret}
}

configtest() {
	local chroot=${DHCPD_CHROOT}

	ebegin "Checking ${SVCNAME} configuration"
	checkconfig
	eend $?
}

start() {
	local chroot=${DHCPD_CHROOT}

	# Work out our cffile if it's in our DHCPD_OPTS
	case " ${DHCPD_OPTS} " in
		*" -cf "*)
			DHCPD_CONF=" ${DHCPD_OPTS} "
			DHCPD_CONF="${DHCPD_CONF##* -cf }"
			DHCPD_CONF="${DHCPD_CONF%% *}"
			;;
		*)	DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
			;;
	esac

	# see comment in get_var() above
	if [ ! -f "${DHCPD_CONF}" ] ; then
		eerror "${DHCPD_CONF} does not exist"
		return 1
	fi

	if [ -n "${chroot}" ] ; then
		# the config test want's these to exist
		mkdir -p "${chroot}"/var/run/dhcp "${chroot}"/var/lib/dhcp
	fi

	checkconfig || return 1

	checkpath -d -o dhcp:dhcp "${chroot}"/var/run/dhcp "${chroot}"/var/lib/dhcp

	local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)"
	checkpath -f -o dhcp:dhcp "${chroot}${leasefile}"

	# Setup LD_PRELOAD so name resolution works in our chroot.
	if [ -n "${chroot}" ] ; then
		checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc
		cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/
		export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so"
		if ! mountinfo -q "${chroot}/proc" ; then
			mount --bind /proc "${chroot}/proc"
		fi
	fi

	local pidfile="$(get_var pid-file-name /var/run/dhcp/${SVCNAME}.pid)"

	ebegin "Starting ${chroot:+chrooted }${SVCNAME}"
	start-stop-daemon --start --exec /usr/sbin/dhcpd \
		--pidfile "${chroot}/${pidfile}" \
		-- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \
		-user dhcp -group dhcp \
		${chroot:+-chroot} ${chroot} ${DHCPD_IFACE}
	eend $? \
		&& save_options chroot "${chroot}" \
		&& save_options pidfile "${pidfile}"
}

stop() {
	local chroot="$(get_options chroot)"

	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
		--pidfile "${chroot}/$(get_options pidfile)"
	res=$?

	if [ ${res} -eq 0 ] && [ -n "${chroot}" ] ; then
		if mountinfo -q "${chroot}/proc" ; then
			umount "${chroot}/proc"
		fi
	fi

	eend $res
}