Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 May 2007 18:42:09 -0400
From:      Andrew Partan <asp@partan.com>
To:        Dejan Lesjak <dejan.lesjak@ijs.si>
Cc:        freebsd-x11@freebsd.org, x11@freebsd.org, Kris Kennaway <kris@obsecurity.org>
Subject:   Re: HEADS UP: xorg 7.2 ready for testing
Message-ID:  <20070511224209.GA79623@partan.com>
In-Reply-To: <200705112347.37431.dejan.lesjak@ijs.si>
References:  <20070510212817.GA67897@xor.obsecurity.org> <20070511211104.GA71170@partan.com> <20070511213451.GA31139@xor.obsecurity.org> <200705112347.37431.dejan.lesjak@ijs.si>

next in thread | previous in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070511224209.GA79623>