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.
This commit is contained in:
parent
a38d1d4c8b
commit
95f0e983b6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=170085
@ -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
|
||||
|
@ -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)),
|
||||
|
Loading…
Reference in New Issue
Block a user