defaults/rc.conf broken

[Giorgos Keramidas]

Hi all,

When running mergemaster in recent CURRENT versions (after 12 Oct), pay
colse attention to the changes made to /etc/defaults/rc.conf and make
sure you apply the following patch as needed.  With an unclosed quote in
defaults/rc.conf all sorts of extremely funny things happen when booting :-)

%%
Index: rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.223
diff -u -r1.223 rc.conf
--- rc.conf	12 Oct 2004 18:45:15 -0000	1.223
+++ rc.conf	13 Oct 2004 05:42:50 -0000
@@ -437,8 +437,7 @@
 osf1_enable="NO"	# Alpha OSF/1 emulation loaded at startup (or NO).
 clear_tmp_enable="NO"	# Clear /tmp at startup.
 ldconfig_insecure="NO"	# Set to YES to disable ldconfig security checks
-ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib /usr/local/lib/com
-pat/pkg"
+ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib /usr/local/lib/compat/pkg"
 			# shared library search paths
 ldconfig_paths_aout="/usr/lib/compat/aout /usr/X11R6/lib/aout /usr/local/lib/aout"
 			# a.out shared library search paths
%%