summaryrefslogtreecommitdiffstats
path: root/etc/defaults
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2007-05-29 06:22:14 +0000
committerdougb <dougb@FreeBSD.org>2007-05-29 06:22:14 +0000
commitcfa8629c4850a5bd7d8ca034dd43c16a6e542ab2 (patch)
tree04ea799542601dbc56beb1abdc4e948ef361584c /etc/defaults
parent57eb78da4c46c88fa232f249fb32318f1c9f78f6 (diff)
downloadFreeBSD-src-cfa8629c4850a5bd7d8ca034dd43c16a6e542ab2.zip
FreeBSD-src-cfa8629c4850a5bd7d8ca034dd43c16a6e542ab2.tar.gz
Now that a separate /usr/X11R6 directory is no longer in fashion,
stop looking there for things like rc.d and periodic. This avoids duplicating effort when /usr/X11R6 is a symlink to /usr/local, which it is by default now. It is not anticipated at this time that we will MFC this change, since we'd like to avoid breaking legacy systems. However, there is a fix for /etc/rc.subr in the works to avoid running any rc.d scripts twice which we should be able to MFC.
Diffstat (limited to 'etc/defaults')
-rw-r--r--etc/defaults/periodic.conf2
-rw-r--r--etc/defaults/rc.conf10
2 files changed, 6 insertions, 6 deletions
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 041b169..38a05aa 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -20,7 +20,7 @@
periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local"
# periodic script dirs
-local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic"
+local_periodic="/usr/local/etc/periodic"
# Daily options
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index e2aa99b..51671ec 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -48,7 +48,7 @@ varsize="32m" # Size of mfs /var if created
varmfs_flags="-S" # Extra mount options for the mfs /var
populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never
cleanvar_enable="YES" # Clean the /var directory
-local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs.
+local_startup="/usr/local/etc/rc.d" # startup script dirs.
script_name_sep=" " # Change if your startup scripts' names contain spaces
rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
@@ -522,14 +522,14 @@ svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO).
clear_tmp_enable="NO" # Clear /tmp at startup.
clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp
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/compat/pkg"
+ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg"
# shared library search paths
ldconfig32_paths="/usr/lib32" # 32-bit compatibility shared library search paths
-ldconfig_paths_aout="/usr/lib/compat/aout /usr/X11R6/lib/aout /usr/local/lib/aout"
+ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout"
# a.out shared library search paths
-ldconfig_local_dirs="/usr/local/libdata/ldconfig /usr/X11R6/libdata/ldconfig"
+ldconfig_local_dirs="/usr/local/libdata/ldconfig"
# Local directories with ldconfig configuration files.
-ldconfig_local32_dirs="/usr/local/libdata/ldconfig32 /usr/X11R6/libdata/ldconfig32"
+ldconfig_local32_dirs="/usr/local/libdata/ldconfig32"
# Local directories with 32-bit compatibility ldconfig
# configuration files.
kern_securelevel_enable="NO" # kernel security level (see init(8)),
OpenPOWER on IntegriCloud