Handle /etc/rc.conf.d directory

diff --git a/init/config-freebsd-5.0-* b/init/config-freebsd-5.0-*
index 9db6ee3..d0d0d8e 100644 (file)
--- a/init/config-freebsd-5.0-*
+++ b/init/config-freebsd-5.0-*
@@ -7,4 +7,4 @@ order=0
 sort_mode=0
 no_chkconfig=0
 rc_dir=/etc/rc.d /usr/local/etc/rc.d
-rc_conf=/etc/defaults/rc.conf /etc/rc.conf
+rc_conf=/etc/defaults/rc.conf /etc/rc.conf.d/* /etc/rc.conf

diff --git a/init/init-lib.pl b/init/init-lib.pl
index a73f4d0..add643e 100755 (executable)
--- a/init/init-lib.pl
+++ b/init/init-lib.pl
@@ -1,4 +1,4 @@
-=head1 init-lib.pl
+chead1 init-lib.pl
 
 Common functions for SYSV-style boot/shutdown sequences, MacOS, FreeBSD
 and Windows. Because each system uses a different format and semantics for
@@ -1317,7 +1317,7 @@ them into a list of hash refs. Each element in the list has the following keys:
 sub get_rc_conf
 {
 local ($file, @rv);
-foreach $file (split(/\s+/, $config{'rc_conf'})) {
+foreach $file (map { glob($_) } split(/\s+/, $config{'rc_conf'})) {
        local $lnum = 0;
        &open_readfile(FILE, $file);
        while(<FILE>) {