Use /etc/defaults/rc.conf everywhere, falling back to /etc/rc.conf
as necessary (for half-assed upgrades).
This commit is contained in:
parent
eb822b5612
commit
9c63624e6f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=43849
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: netstart,v 1.51 1997/05/18 20:11:44 jkh Exp $
|
# $Id: netstart,v 1.52 1997/07/05 19:35:45 pst Exp $
|
||||||
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# This file is NOT called by any of the other scripts - it has been
|
# This file is NOT called by any of the other scripts - it has been
|
||||||
@ -10,7 +10,9 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# If there is a global system configuration file, suck it in.
|
# If there is a global system configuration file, suck it in.
|
||||||
if [ -f /etc/rc.conf ]; then
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
|
. /etc/defaults/rc.conf
|
||||||
|
elif [ -f /etc/rc.conf ]; then
|
||||||
. /etc/rc.conf
|
. /etc/rc.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -1,14 +1,16 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id:$
|
# $Id: pccard_ether,v 1.9 1998/09/02 01:34:56 brian Exp $
|
||||||
#
|
#
|
||||||
# pccard_ether interfacename [ifconfig option]
|
# pccard_ether interfacename [ifconfig option]
|
||||||
#
|
#
|
||||||
# example: pccard_ether ep0 -link0
|
# example: pccard_ether ep0 -link0
|
||||||
#
|
#
|
||||||
|
|
||||||
# Suck in the /etc/rc.conf variables
|
# Suck in the configuration variables
|
||||||
if [ -f /etc/rc.conf ]; then
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
|
. /etc/defaults/rc.conf
|
||||||
|
elif [ -f /etc/rc.conf ]; then
|
||||||
. /etc/rc.conf
|
. /etc/rc.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
6
etc/rc
6
etc/rc
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# $Id: rc,v 1.176 1999/02/09 05:20:46 dillon Exp $
|
# $Id: rc,v 1.177 1999/02/09 17:17:18 dillon Exp $
|
||||||
# From: @(#)rc 5.27 (Berkeley) 6/5/91
|
# From: @(#)rc 5.27 (Berkeley) 6/5/91
|
||||||
|
|
||||||
# System startup script run by init on autoboot
|
# System startup script run by init on autoboot
|
||||||
@ -34,7 +34,9 @@ fi
|
|||||||
|
|
||||||
# If there is a global system configuration file, suck it in.
|
# If there is a global system configuration file, suck it in.
|
||||||
#
|
#
|
||||||
if [ -f /etc/rc.conf ]; then
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
|
. /etc/defaults/rc.conf
|
||||||
|
elif [ -f /etc/rc.conf ]; then
|
||||||
. /etc/rc.conf
|
. /etc/rc.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -3,9 +3,10 @@
|
|||||||
# REQUIRE: initdiskless mountcritlocal
|
# REQUIRE: initdiskless mountcritlocal
|
||||||
if [ -n "$4" ]; then
|
if [ -n "$4" ]; then
|
||||||
bpi="-i $4"
|
bpi="-i $4"
|
||||||
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
if [ -f /etc/rc.conf ]; then
|
/sbin/mdconfig -a -t malloc -s $1 -u $3
|
||||||
. /etc/rc.conf
|
elif [ -f /etc/rc.conf ]; then
|
||||||
|
/sbin/mount /dev/md$3c $2
|
||||||
}
|
}
|
||||||
|
|
||||||
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
||||||
|
@ -3,9 +3,10 @@
|
|||||||
# REQUIRE: initdiskless mountcritlocal
|
# REQUIRE: initdiskless mountcritlocal
|
||||||
if [ -n "$4" ]; then
|
if [ -n "$4" ]; then
|
||||||
bpi="-i $4"
|
bpi="-i $4"
|
||||||
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
if [ -f /etc/rc.conf ]; then
|
/sbin/mdconfig -a -t malloc -s $1 -u $3
|
||||||
. /etc/rc.conf
|
elif [ -f /etc/rc.conf ]; then
|
||||||
|
/sbin/mount /dev/md$3c $2
|
||||||
}
|
}
|
||||||
|
|
||||||
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
||||||
|
@ -3,9 +3,10 @@
|
|||||||
# REQUIRE: initdiskless mountcritlocal
|
# REQUIRE: initdiskless mountcritlocal
|
||||||
if [ -n "$4" ]; then
|
if [ -n "$4" ]; then
|
||||||
bpi="-i $4"
|
bpi="-i $4"
|
||||||
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
if [ -f /etc/rc.conf ]; then
|
/sbin/mdconfig -a -t malloc -s $1 -u $3
|
||||||
. /etc/rc.conf
|
elif [ -f /etc/rc.conf ]; then
|
||||||
|
/sbin/mount /dev/md$3c $2
|
||||||
}
|
}
|
||||||
|
|
||||||
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
||||||
|
@ -3,9 +3,10 @@
|
|||||||
# REQUIRE: initdiskless mountcritlocal
|
# REQUIRE: initdiskless mountcritlocal
|
||||||
if [ -n "$4" ]; then
|
if [ -n "$4" ]; then
|
||||||
bpi="-i $4"
|
bpi="-i $4"
|
||||||
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
if [ -f /etc/rc.conf ]; then
|
/sbin/mdconfig -a -t malloc -s $1 -u $3
|
||||||
. /etc/rc.conf
|
elif [ -f /etc/rc.conf ]; then
|
||||||
|
/sbin/mount /dev/md$3c $2
|
||||||
}
|
}
|
||||||
|
|
||||||
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
#
|
#
|
||||||
# $Id: rc.devfs,v 1.2 1998/09/20 18:49:04 sos Exp $
|
# $Id: rc.devfs,v 1.3 1998/10/13 08:25:09 jkh Exp $
|
||||||
#
|
#
|
||||||
# If there is a global system configuration file, suck it in.
|
# If there is a global system configuration file, suck it in.
|
||||||
if [ -f /etc/rc.conf ]; then
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
|
. /etc/defaults/rc.conf
|
||||||
|
elif [ -f /etc/rc.conf ]; then
|
||||||
. /etc/rc.conf
|
. /etc/rc.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -3,9 +3,10 @@
|
|||||||
|
|
||||||
# If there is a global system configuration file, suck it in.
|
# If there is a global system configuration file, suck it in.
|
||||||
#
|
#
|
||||||
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
if [ -f /etc/rc.conf ]; then
|
. /etc/defaults/rc.conf
|
||||||
. /etc/rc.conf
|
elif [ -f /etc/rc.conf ]; then
|
||||||
|
. /etc/rc.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
############
|
############
|
||||||
# Setup system for firewall service.
|
# Setup system for firewall service.
|
||||||
# $Id: rc.firewall,v 1.18 1998/04/18 10:27:05 brian Exp $
|
# $Id: rc.firewall,v 1.19 1998/04/25 00:40:55 alex Exp $
|
||||||
|
|
||||||
if [ -f /etc/rc.conf ]; then
|
# Suck in the configuration variables.
|
||||||
|
if [ -f /etc/defaults/rc.conf ]; then
|
||||||
|
. /etc/defaults/rc.conf
|
||||||
|
elif [ -f /etc/rc.conf ]; then
|
||||||
. /etc/rc.conf
|
. /etc/rc.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user