From owner-freebsd-bugs Mon Nov 11 19:20: 9 2002 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4669537B401 for ; Mon, 11 Nov 2002 19:20:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A00AC43E75 for ; Mon, 11 Nov 2002 19:20:05 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gAC3K5x3092884 for ; Mon, 11 Nov 2002 19:20:05 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAC3K5D1092880; Mon, 11 Nov 2002 19:20:05 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5834737B401 for ; Mon, 11 Nov 2002 19:12:27 -0800 (PST) Received: from out003.verizon.net (out003pub.verizon.net [206.46.170.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9245B43E4A for ; Mon, 11 Nov 2002 19:12:26 -0800 (PST) (envelope-from arlankfo@verizon.net) Received: from verizon.net ([151.200.246.143]) by out003.verizon.net (InterMail vM.5.01.05.09 201-253-122-126-109-20020611) with ESMTP id <20021112031225.VHNT3528.out003.verizon.net@verizon.net> for ; Mon, 11 Nov 2002 21:12:25 -0600 Message-Id: <20021112031225.VHNT3528.out003.verizon.net@verizon.net> Date: Mon, 11 Nov 2002 22:12:32 -0500 From: Andrew Lankford Reply-To: Andrew Lankford To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: conf/45226: Fix for rc.network, ppp-user annoyance Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 45226 >Category: conf >Synopsis: Fix for rc.network, ppp-user annoyance >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 11 19:20:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Andrew Lankford >Release: FreeBSD 5.0-CURRENT i386 >Organization: N/A >Environment: System: FreeBSD bogushost2 5.0-CURRENT FreeBSD 5.0-CURRENT #21: Sun Nov 10 13:42:51 EST 2002 root@bogushost2:/usr/obj/usr/src/sys/ARL5KERNEL i386 (also applies to /etc/rc.network in STABLE) >Description: If user ppp doesn't exit cleanly, a control socket created with the "set socket ..." isn't erased. Instead, it prevents a fresh control socket from being created the next time user ppp is launched at startup. >How-To-Repeat: Power failure, etc... >Fix: The script that launches syslogd deletes /var/run/log immediately beforehand. The same thing ought to be done with user ppp control sockets. An additional variable is added to rc.conf, pppctl_socket, which will be set to "" by default (or maybe "/var/run/internet"). The patches in rc.network and ppp-user check for the presence of the socket and delete it. Three small patches for -CURRENT: --- /usr/src/etc/defaults/rc.conf.orig Mon Nov 11 20:53:02 2002 +++ /usr/src/etc/defaults/rc.conf Mon Nov 11 20:54:18 2002 @@ -116,6 +116,7 @@ ppp_nat="YES" # Use PPP's internal network address translation or NO. ppp_profile="papchap" # Which profile to use from /etc/ppp/ppp.conf. ppp_user="root" # Which user to run ppp as +pppctl_socket="" # Socket for pppctl to use (or empty string "") ### Network daemon (miscellaneous) ### syslogd_enable="YES" # Run syslog daemon (or NO). --- /usr/src/etc/rc.d/ppp-user.orig Mon Oct 14 09:39:44 2002 +++ /usr/src/etc/rc.d/ppp-user Mon Nov 11 21:47:48 2002 @@ -15,7 +15,11 @@ stop_cmd=":" ppp_start() -{ +{ + # Erase old pppctl socket + # + [ -S "${pppctl_socket}" ] && rm -f ${pppctl_socket} + # Establish ppp mode. # if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \ --- /usr/src/etc/rc.network.orig Mon Nov 11 20:57:25 2002 +++ /usr/src/etc/rc.network Mon Nov 11 21:48:02 2002 @@ -282,6 +282,10 @@ # case ${ppp_enable} in [Yy][Ee][Ss]) + # Erase old pppctl socket + # + [ -S "${pppctl_socket}" ] && rm -f ${pppctl_socket} + # Establish ppp mode. # if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message