From ff3abf62e267c5636425453e4b9cf7afa89f0584 Mon Sep 17 00:00:00 2001 From: Esben Norby Date: Thu, 1 Jun 2006 21:37:44 +0000 Subject: Hook dhcrelay(8) into the startup process. ok henning@ --- etc/rc | 6 +++++- etc/rc.conf | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/etc/rc b/etc/rc index ac81a99bd1a..76abe12d5c3 100644 --- a/etc/rc +++ b/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/etc/rc.conf b/etc/rc.conf index 173683c441c..5d39e59e880 100644 --- a/etc/rc.conf +++ b/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: "" -- cgit v1.2.3