From owner-freebsd-current@FreeBSD.ORG  Sun Jun 27 21:54:02 2010
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC315106564A
	for <freebsd-current@freebsd.org>; Sun, 27 Jun 2010 21:54:02 +0000 (UTC)
	(envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C4FC8FC0C
	for <freebsd-current@freebsd.org>; Sun, 27 Jun 2010 21:53:56 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o5RLnr7U075177;
	Sun, 27 Jun 2010 15:49:54 -0600 (MDT) (envelope-from imp@bsdimp.com)
Date: Sun, 27 Jun 2010 15:50:04 -0600 (MDT)
Message-Id: <20100627.155004.49280345238493664.imp@bsdimp.com>
To: yanefbsd@gmail.com
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <AANLkTilnYGNz7V6z6AkeKsqUvOMN8yLvO57GM1gOIsTD@mail.gmail.com>
References: <201006262229.09747.hselasky@c2i.net>
	<AANLkTilVB_E-BiOtC-gENBQ7FdPTLcmu8qpmdwU1GyXd@mail.gmail.com>
	<AANLkTilnYGNz7V6z6AkeKsqUvOMN8yLvO57GM1gOIsTD@mail.gmail.com>
X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: freebsd-current@freebsd.org, hselasky@c2i.net
Subject: Re: Patch for rc.d/devd on FreeBSD 9-current
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jun 2010 21:54:02 -0000

In message: <AANLkTilnYGNz7V6z6AkeKsqUvOMN8yLvO57GM1gOIsTD@mail.gmail.c=
om>
            Garrett Cooper <yanefbsd@gmail.com> writes:
: On Sat, Jun 26, 2010 at 1:45 PM, Garrett Cooper <yanefbsd@gmail.com> =
wrote:
: > On Sat, Jun 26, 2010 at 1:29 PM, Hans Petter Selasky <hselasky@c2i.=
net> wrote:
: >> Hi,
: >>
: >> Sometimes utilities that are started by devd require libraries out=
side
: >> /usr/lib. One example is the webcamd utility which is started by d=
evd upon USB
: >> device insertion. What do you think about the following patch:
: >>
: >> --- devd =A0 =A0 =A0 =A0(revision 209463)
: >> +++ devd =A0 =A0 =A0 =A0(local)
: >> @@ -4,7 +4,7 @@
: >> =A0#
: >>
: >> =A0# PROVIDE: devd
: >> -# REQUIRE: netif
: >> +# REQUIRE: netif ldconfig
: >> =A0# BEFORE: NETWORKING mountcritremote
: >> =A0# KEYWORD: nojail shutdown
: >
: > Funny since I was just monkeying around with this. This doesn't app=
ear
: > to be the only issue with devd:
: >
: > # devd
: > devd: devd already running, pid: 430
: > # pgrep 430; echo $?
: > 1
: > #
: >
: > Looks like /etc/rc.d/devd restart is broken :(...
: =

: This seems to fix that.
: Thanks,
: -Garrett
: =

: Index: devd.cc
: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
: --- devd.cc	(revision 209530)
: +++ devd.cc	(working copy)
: @@ -739,6 +739,7 @@
:  static void
:  event_loop(void)
:  {
: +	bool warn_user_about_cleanup;
:  	int rv;
:  	int fd;
:  	char buffer[DEVCTL_MAXBUF];
: @@ -804,6 +805,17 @@
:  			new_client(server_fd);
:  	}
:  	close(fd);
: +	close(server_fd);
: +
: +	if (unlink(PIPE) =3D=3D 0) {
: +		cfg.remove_pidfile();
: +		warn_user_about_cleanup =3D false;
: +	} else
: +		warn_user_about_cleanup =3D true;
: +
: +	if (warn_user_about_cleanup =3D=3D true)
: +		warn("cleanup failed");
: +

Why not fix pidfile_open to not return a file handle when the PID
doesn't match?  Seems like a bug to me in that routine as well.

Warner