From owner-freebsd-x11@FreeBSD.ORG  Fri May 11 22:42:10 2007
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
X-Original-To: freebsd-x11@freebsd.org
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6450E16A405;
	Fri, 11 May 2007 22:42:10 +0000 (UTC) (envelope-from asp@partan.com)
Received: from tower.partan.com (tower.partan.com [198.6.255.248])
	by mx1.freebsd.org (Postfix) with ESMTP id 26EF813C469;
	Fri, 11 May 2007 22:42:09 +0000 (UTC) (envelope-from asp@partan.com)
Received: from tower.partan.com (localhost.partan.com [127.0.0.1])
	by tower.partan.com (8.13.1/8.13.1) with ESMTP id l4BMg969079811;
	Fri, 11 May 2007 18:42:09 -0400 (EDT)
	(envelope-from asp@tower.partan.com)
Received: (from asp@localhost)
	by tower.partan.com (8.13.1/8.13.1/Submit) id l4BMg9Lm079808;
	Fri, 11 May 2007 18:42:09 -0400 (EDT) (envelope-from asp)
Date: Fri, 11 May 2007 18:42:09 -0400
From: Andrew Partan <asp@partan.com>
To: Dejan Lesjak <dejan.lesjak@ijs.si>
Message-ID: <20070511224209.GA79623@partan.com>
References: <20070510212817.GA67897@xor.obsecurity.org>
	<20070511211104.GA71170@partan.com>
	<20070511213451.GA31139@xor.obsecurity.org>
	<200705112347.37431.dejan.lesjak@ijs.si>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200705112347.37431.dejan.lesjak@ijs.si>
User-Agent: Mutt/1.4.2.2i
Cc: freebsd-x11@freebsd.org, x11@freebsd.org,
	Kris Kennaway <kris@obsecurity.org>
Subject: Re: HEADS UP: xorg 7.2 ready for testing
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 May 2007 22:42:10 -0000

On Fri, May 11, 2007 at 05:11:05PM -0400, Andrew Partan wrote:
> Tools/scripts/mergebase.sh correctly disabled local_startup but it
> didn't correctly disable local_periodic.

This turns out to be a bug in /etc/defaults/periodic.conf.
For some reason, when called from mergebase.sh, this bit does not work:
	[ -r $i ] && . $i
but this does:
	if [ -r $i ]; then
		. $i
	fi

/etc/defaults/rc.conf uses the 2nd method which is why that part works.

The is FreeBSD 6.2.p4, and this version:
# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.2 2006/09/28 01:59:29 delphij Exp $
	--asp@partan.com (Andrew Partan)


--- /etc/defaults/periodic.conf	Fri Jan 12 02:13:15 2007
+++ /tmp/periodic.conf	Fri May 11 18:36:14 2007
@@ -257,7 +257,9 @@
                                 ;;
                         *)
                                 sourced_files="${sourced_files}:$i:"
-                                [ -r $i ] && . $i
+                                if [ -r $i ]; then
+					. $i
+				fi
                                 ;;
                         esac
                 done