Complete support for rc.conf.d
- gendepends.sh needs to read this directory to allow dependencies to be
  overridden
  - init.sh for Linux and Bsd need to read it to allow config settings
    they use to be overridden.
			
			
This commit is contained in:
		@@ -96,6 +96,11 @@ do
 | 
			
		||||
		fi
 | 
			
		||||
 | 
			
		||||
		[ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
 | 
			
		||||
		if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
 | 
			
		||||
			for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
 | 
			
		||||
				[ -e "$_f" ] && . "$_f"
 | 
			
		||||
			done
 | 
			
		||||
		fi
 | 
			
		||||
 | 
			
		||||
		if . "$_dir/$RC_SVCNAME"; then
 | 
			
		||||
			echo "$RC_SVCNAME" >&3
 | 
			
		||||
 
 | 
			
		||||
@@ -23,6 +23,11 @@ mount_svcdir()
 | 
			
		||||
 | 
			
		||||
. "$RC_LIBEXECDIR"/sh/functions.sh
 | 
			
		||||
[ -r "@SYSCONFDIR@/rc.conf" ] && . "@SYSCONFDIR@/rc.conf"
 | 
			
		||||
if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
 | 
			
		||||
	for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
 | 
			
		||||
		[ -r "$_f" ] && . "$_f"
 | 
			
		||||
	done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# Disable devd until we need it
 | 
			
		||||
if [ -z "$RC_SYS" -a "$RC_UNAME" = "FreeBSD" ]; then
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,11 @@
 | 
			
		||||
 | 
			
		||||
. "$RC_LIBEXECDIR"/sh/functions.sh
 | 
			
		||||
[ -r "@SYSCONFDIR@/rc.conf" ] && . "@SYSCONFDIR@/rc.conf"
 | 
			
		||||
if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
 | 
			
		||||
	for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
 | 
			
		||||
		[ -e "$_f" ] && . "$_f"
 | 
			
		||||
	done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# By default VServer already has /proc mounted, but OpenVZ does not!
 | 
			
		||||
# However, some of our users have an old proc image in /proc
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user