From 9e2d74d6a25d2d2d88c975a6132d80dcf927a10e Mon Sep 17 00:00:00 2001
From: norby <>
Date: Thu, 1 Jun 2006 21:37:43 +0000
Subject: [PATCH] Hook dhcrelay(8) into the startup process.

ok henning@
---
 src/etc/rc      | 6 +++++-
 src/etc/rc.conf | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index ac81a99b..76abe12d 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.284 2006/06/01 16:43:23 norby Exp $
+#	$OpenBSD: rc,v 1.285 2006/06/01 21:37:43 norby Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -593,6 +593,10 @@ if [ X"${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then
 	echo -n ' dhcpd';	/usr/sbin/dhcpd ${dhcpd_flags} ${dhcpd_ifs}
 fi
 
+if [ X"${dhcrelay_flags}" != X"NO" ]; then
+	echo -n ' dhcrelay';		/usr/sbin/dhcrelay $dhcrelay_flags
+fi
+
 if ifconfig lo0 inet6 >/dev/null 2>&1; then
 	fw=`sysctl -n net.inet6.ip6.forwarding`
 	if [ X"${fw}" = X"0" ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 173683c4..5d39e59e 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.114 2006/06/01 16:43:23 norby Exp $
+#	$OpenBSD: rc.conf,v 1.115 2006/06/01 21:37:43 norby Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -22,6 +22,7 @@ mopd_flags=NO		# for normal use: "-a"
 apmd_flags=NO		# for normal use: ""
 acpid_flags=NO		# for normal use: ""
 dhcpd_flags=NO		# for normal use: ""
+dhcrelay_flags=NO	# for normal use: "-i interface [server]"
 rtadvd_flags=NO		# for normal use: list of interfaces
 			# be sure to set net.inet6.ip6.forwarding=1
 route6d_flags=NO	# for normal use: ""