HEADS UP: xorg 7.2 ready for testing

[Andrew Partan]

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 at 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