diff options
| author | Esben Norby <norby@cvs.openbsd.org> | 2006-06-01 21:37:44 +0000 |
|---|---|---|
| committer | Esben Norby <norby@cvs.openbsd.org> | 2006-06-01 21:37:44 +0000 |
| commit | ff3abf62e267c5636425453e4b9cf7afa89f0584 (patch) | |
| tree | bf64f6bf263ccbf7811d5d59c5e96ad18e3bf8e2 | |
| parent | 81eb534391226922b3a62e3683dd3f9adc73182e (diff) | |
Hook dhcrelay(8) into the startup process.
ok henning@
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.conf | 3 |
2 files changed, 7 insertions, 2 deletions
@@ -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: "" |