diff options
| author | peter <peter@FreeBSD.org> | 1999-01-26 05:14:36 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-01-26 05:14:36 +0000 |
| commit | da6fac416009d65a9d8300c0e5fce12536c6cc96 (patch) | |
| tree | 11f6e7141267e3943891199628235a9cc7b0962d /etc/rc | |
| parent | 101778f606bea11a414cdde70c9fb6708c6c5bab (diff) | |
| download | FreeBSD-src-da6fac416009d65a9d8300c0e5fce12536c6cc96.zip FreeBSD-src-da6fac416009d65a9d8300c0e5fce12536c6cc96.tar.gz | |
Move reading of rc.conf sooner as requested by Greg. I'm a tad nervous
about this becase that makes it get run *before* the filesystems are
mounted. If people have added stuff to their rc.conf or rc.conf.local
that uses stuff outside of /bin and /sbin, this will break.
Diffstat (limited to 'etc/rc')
| -rw-r--r-- | etc/rc | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.171 1999/01/25 18:07:25 dillon Exp $ +# $Id: rc,v 1.172 1999/01/26 04:59:43 peter Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -33,12 +33,18 @@ if [ -f /etc/rc.diskless ]; then fi fi +# If there is a global system configuration file, suck it in. +# +if [ -f /etc/rc.conf ]; then + . /etc/rc.conf +fi + # Configure ccd devices. if [ "X$skip_diskconf" != "XYES" -a -f /etc/ccd.conf ]; then ccdconfig -C fi -if [ -n "$vinum_slices" ]; then +if [ "X$skip_diskconf" != "XYES" -a -n "$vinum_slices" ]; then vinum read $vinum_slices fi @@ -104,13 +110,6 @@ if [ "X$skip_diskconf" != "XYES" ]; then fi fi -# If there is a global system configuration file, suck it in. -# - -if [ -f /etc/rc.conf ]; then - . /etc/rc.conf -fi - # Run custom disk mounting function here # |
