Module Name: src
Committed By: prlw1
Date: Sun Jan 13 18:47:58 UTC 2013
Modified Files:
src/etc/defaults: rc.conf
src/etc/rc.d: ppp
src/share/man/man5: rc.conf.5
Log Message:
Add ppp=YES variable. Currently pppd(8) starts automatically if ppp_peers
is not empty. Adding a ppp variable allows the default peer to be set,
and ppp set to NO so that dialing can happen with /etc/rc.d/ppp onestart.
Default set to YES so that old behaviour is preserved.
http://mail-index.netbsd.org/tech-userlevel/2012/08/21/msg006656.html
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/etc/defaults/rc.conf
cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/ppp
cvs rdiff -u -r1.154 -r1.155 src/share/man/man5/rc.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.121 src/etc/defaults/rc.conf:1.122
--- src/etc/defaults/rc.conf:1.121 Fri Jan 11 04:32:41 2013
+++ src/etc/defaults/rc.conf Sun Jan 13 18:47:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.121 2013/01/11 04:32:41 riastradh Exp $
+# $NetBSD: rc.conf,v 1.122 2013/01/13 18:47:57 prlw1 Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -179,7 +179,7 @@ dhcpcd_flags="-q" # For ifconfig_XXX=
dhclient=NO # behave as a DHCP client
dhclient_flags="" # blank: config all interfaces
ntpdate=NO ntpdate_flags="-b -s" # May need '-u' thru firewall
-ppp_peers="" # /etc/ppp/peers to call
+ppp=YES ppp_peers="" # /etc/ppp/peers to call
ip6mode=host # host, autohost or router
ip6uniquelocal=NO # IPv6 unique-local forwarding
rtsol=NO rtsol_flags="-a" # for ip6mode=autohost only
Index: src/etc/rc.d/ppp
diff -u src/etc/rc.d/ppp:1.10 src/etc/rc.d/ppp:1.11
--- src/etc/rc.d/ppp:1.10 Thu Dec 13 21:51:52 2012
+++ src/etc/rc.d/ppp Sun Jan 13 18:47:58 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ppp,v 1.10 2012/12/13 21:51:52 wiz Exp $
+# $NetBSD: ppp,v 1.11 2013/01/13 18:47:58 prlw1 Exp $
#
# PROVIDE: ppp
@@ -14,6 +14,7 @@
$_rc_subr_loaded . /etc/rc.subr
name="ppp"
+rcvar=$name
start_cmd="ppp_start"
stop_cmd="ppp_stop"
sig_stop="-INT"
Index: src/share/man/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.154 src/share/man/man5/rc.conf.5:1.155
--- src/share/man/man5/rc.conf.5:1.154 Tue Oct 2 09:18:59 2012
+++ src/share/man/man5/rc.conf.5 Sun Jan 13 18:47:58 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: rc.conf.5,v 1.154 2012/10/02 09:18:59 roy Exp $
+.\" $NetBSD: rc.conf.5,v 1.155 2013/01/13 18:47:58 prlw1 Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -887,9 +887,17 @@ Boolean value.
Run
.Xr pflogd 8
for dumping packet filter logging information to a file.
+.It Sy ppp
+A boolean. Toggles starting
+.Xr pppd 8
+on startup. See
+.Sy ppp_peers
+below.
.It Sy ppp_peers
A string.
If
+.Sy ppp
+is true and
.Sy ppp_peers
is not empty, then
.Pa /etc/rc.d/ppp
