From owner-svn-src-all@FreeBSD.ORG Wed Oct 26 08:41:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82C88106564A; Wed, 26 Oct 2011 08:41:41 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 67CB68FC14; Wed, 26 Oct 2011 08:41:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9Q8ffsf040469; Wed, 26 Oct 2011 08:41:41 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9Q8ffxh040463; Wed, 26 Oct 2011 08:41:41 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201110260841.p9Q8ffxh040463@svn.freebsd.org> From: Martin Matuska Date: Wed, 26 Oct 2011 08:41:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226787 - in stable/8: etc/defaults etc/rc.d share/man/man5 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2011 08:41:41 -0000 Author: mm Date: Wed Oct 26 08:41:41 2011 New Revision: 226787 URL: http://svn.freebsd.org/changeset/base/226787 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 [1] Reported by: Joe Dahl [2] Submitted by: Sergey Kandaurov [3] Added: stable/8/etc/rc.d/static_ndp - copied, changed from r226654, head/etc/rc.d/static_ndp Modified: stable/8/etc/defaults/rc.conf stable/8/etc/rc.d/Makefile stable/8/etc/rc.d/NETWORKING stable/8/share/man/man5/rc.conf.5 Directory Properties: stable/8/etc/ (props changed) stable/8/share/man/man5/ (props changed) Modified: stable/8/etc/defaults/rc.conf ============================================================================== --- stable/8/etc/defaults/rc.conf Wed Oct 26 08:34:00 2011 (r226786) +++ stable/8/etc/defaults/rc.conf Wed Oct 26 08:41:41 2011 (r226787) @@ -379,6 +379,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/8/etc/rc.d/Makefile ============================================================================== --- stable/8/etc/rc.d/Makefile Wed Oct 26 08:34:00 2011 (r226786) +++ stable/8/etc/rc.d/Makefile Wed Oct 26 08:41:41 2011 (r226787) @@ -32,7 +32,7 @@ FILES= DAEMON FILESYSTEMS LOGIN NETWORKI random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rtsold rwho \ savecore sdpd securelevel sendmail \ - serial sppp statd static_arp swap1 \ + serial sppp statd static_arp static_ndp swap1 \ syscons sysctl syslogd \ timed tmp \ ugidfw \ Modified: stable/8/etc/rc.d/NETWORKING ============================================================================== --- stable/8/etc/rc.d/NETWORKING Wed Oct 26 08:34:00 2011 (r226786) +++ stable/8/etc/rc.d/NETWORKING Wed Oct 26 08:41:41 2011 (r226787) @@ -6,6 +6,7 @@ # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netoptions routing network_ipv6 ppp ipfw # REQUIRE: defaultroute routed mrouted route6d mroute6d resolv +# REQUIRE: static_arp static_ndp # This is a dummy dependency, for services which require networking # to be operational before starting. Copied and modified: stable/8/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/8/etc/rc.d/static_ndp Wed Oct 26 08:41:41 2011 (r226787) @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2011 The FreeBSD Project +# Copyright (c) 2011 Xin Li # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: stable/8/share/man/man5/rc.conf.5 ============================================================================== --- stable/8/share/man/man5/rc.conf.5 Wed Oct 26 08:34:00 2011 (r226786) +++ stable/8/share/man/man5/rc.conf.5 Wed Oct 26 08:41:41 2011 (r226787) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 19, 2011 +.Dd October 23, 2011 .Dt RC.CONF 5 .Os .Sh NAME @@ -2312,6 +2312,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