Author: mm
Date: Wed Oct 26 08:34:00 2011
New Revision: 226786
URL: http://svn.freebsd.org/changeset/base/226786
Log:
MFC r226654, r226657, r226658:
MFC r226654 [1]:
Add etc/rc.d/static_ndp, analogous to etc/rc.d/static_arp.
Make sure that static ARP and NDP bindings are set before NETWORKING.
As static_ndp is based on static_arp, pass copyright to the project with
permission of the original author (delphij@).
MFC r226657 [2]:
Correctly reassign copyright of etc/rc.d/static_ndp back to delphij@
as the project itself is no legal entity
MFC r226658 [3]:
Add information about static_ndp_pairs to rc.conf(5) manual page
Reviewed by: Xin Li <delp...@freebsd.org> [1]
Reported by: Joe Dahl <j...@vnode.se> [2]
Submitted by: Sergey Kandaurov <pluk...@freebsd.org> [3]
Approved by: re (kib)
Added:
stable/9/etc/rc.d/static_ndp
- copied, changed from r226654, head/etc/rc.d/static_ndp
Modified:
stable/9/etc/defaults/rc.conf
stable/9/etc/rc.d/Makefile
stable/9/etc/rc.d/NETWORKING
stable/9/share/man/man5/rc.conf.5
Directory Properties:
stable/9/etc/ (props changed)
stable/9/share/man/man5/ (props changed)
Modified: stable/9/etc/defaults/rc.conf
==============================================================================
--- stable/9/etc/defaults/rc.conf Wed Oct 26 07:49:47 2011
(r226785)
+++ stable/9/etc/defaults/rc.conf Wed Oct 26 08:34:00 2011
(r226786)
@@ -383,6 +383,7 @@ bsnmpd_flags="" # Flags for bsnmpd.
### Network routing options: ###
defaultrouter="NO" # Set to default gateway (or NO).
static_arp_pairs="" # Set to static ARP list (or leave empty).
+static_ndp_pairs="" # Set to static NDP list (or leave empty).
static_routes="" # Set to static route list (or leave empty).
natm_static_routes="" # Set to static route list for NATM (or leave
empty).
gateway_enable="NO" # Set to YES if this host will be a gateway.
Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile Wed Oct 26 07:49:47 2011 (r226785)
+++ stable/9/etc/rc.d/Makefile Wed Oct 26 08:34:00 2011 (r226786)
@@ -32,7 +32,7 @@ FILES= DAEMON FILESYSTEMS LOGIN NETWORKI
random rarpd rctl resolv rfcomm_pppd_server root \
route6d routed routing rpcbind rtadvd rtsold rwho \
savecore sdpd securelevel sendmail \
- serial sppp statd static_arp stf swap1 \
+ serial sppp statd static_arp static_ndp stf swap1 \
syscons sysctl syslogd \
timed tmp \
ugidfw \
Modified: stable/9/etc/rc.d/NETWORKING
==============================================================================
--- stable/9/etc/rc.d/NETWORKING Wed Oct 26 07:49:47 2011
(r226785)
+++ stable/9/etc/rc.d/NETWORKING Wed Oct 26 08:34:00 2011
(r226786)
@@ -6,6 +6,7 @@
# PROVIDE: NETWORKING NETWORK
# REQUIRE: netif netoptions routing ppp ipfw stf faith
# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge
+# REQUIRE: static_arp static_ndp
# This is a dummy dependency, for services which require networking
# to be operational before starting.
Copied and modified: stable/9/etc/rc.d/static_ndp (from r226654,
head/etc/rc.d/static_ndp)
==============================================================================
--- head/etc/rc.d/static_ndp Sun Oct 23 09:08:42 2011 (r226654, copy
source)
+++ stable/9/etc/rc.d/static_ndp Wed Oct 26 08:34:00 2011
(r226786)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2011 The FreeBSD Project
+# Copyright (c) 2011 Xin Li <delp...@freebsd.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: stable/9/share/man/man5/rc.conf.5
==============================================================================
--- stable/9/share/man/man5/rc.conf.5 Wed Oct 26 07:49:47 2011
(r226785)
+++ stable/9/share/man/man5/rc.conf.5 Wed Oct 26 08:34:00 2011
(r226786)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 13, 2011
+.Dd October 23, 2011
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -2568,6 +2568,22 @@ For example
static_arp_pairs="gw"
static_arp_gw="192.168.1.1 00:01:02:03:04:05"
.Ed
+.It Va static_ndp_pairs
+.Pq Vt str
+Set to the list of static NDP pairs that are to be added at system
+boot time.
+For each whitespace separated
+.Ar element
+in the value, a
+.Va static_ndp_ Ns Aq Ar element
+variable is assumed to exist whose contents will later be passed to a
+.Dq Nm ndp Cm -s
+operation.
+For example
+.Bd -literal
+static_ndp_pairs="gw"
+static_ndp_gw="2001:db8:3::1 00:01:02:03:04:05"
+.Ed
.It Va static_routes
.Pq Vt str
Set to the list of static routes that are to be added at system
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
