Slight reordering of /etc/rc order: It now goes
... recover vi msgs/bounds update MOTD rc.{arch} rc.devfs rc.local $local.startup securelevel The motive behind this is to delay rc.{arch} as long as possible, as it loads the screensaver, which kills the splash screen. But at the same time, it can't be done after rc.devfs, as that might depend on arch specific actions. rc.local and local.startup also should come after these, and securelevel must be last of all.
This commit is contained in:
parent
47b69cc1b8
commit
011afabb7a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=51617
58
etc/rc
58
etc/rc
@ -404,13 +404,6 @@ esac
|
||||
|
||||
echo '.'
|
||||
|
||||
# Configure implementation specific stuff
|
||||
#
|
||||
arch=`uname -m`
|
||||
if [ -r /etc/rc.${arch} ]; then
|
||||
. /etc/rc.${arch}
|
||||
fi
|
||||
|
||||
# Recover vi editor files.
|
||||
find /var/tmp/vi.recover ! -type f -a ! -type d -delete
|
||||
vibackup=`echo /var/tmp/vi.recover/vi.*`
|
||||
@ -459,28 +452,6 @@ if [ -d /var/msgs -a ! -f /var/msgs/bounds ]; then
|
||||
echo 0 > /var/msgs/bounds
|
||||
fi
|
||||
|
||||
# For each valid dir in $local_startup, search for init scripts matching *.sh
|
||||
#
|
||||
case ${local_startup} in
|
||||
[Nn][Oo] | '')
|
||||
;;
|
||||
*)
|
||||
echo -n 'Local package initialization:'
|
||||
for dir in ${local_startup}; do
|
||||
if [ -d "${dir}" ]; then
|
||||
for script in ${dir}/*.sh; do
|
||||
if [ -x "${script}" ]; then
|
||||
(set -T
|
||||
trap 'exit 1' 2
|
||||
${script} start)
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
echo .
|
||||
;;
|
||||
esac
|
||||
|
||||
case ${update_motd} in
|
||||
[Nn][Oo] | '')
|
||||
;;
|
||||
@ -497,6 +468,13 @@ case ${update_motd} in
|
||||
;;
|
||||
esac
|
||||
|
||||
# Configure implementation specific stuff
|
||||
#
|
||||
arch=`uname -m`
|
||||
if [ -r /etc/rc.${arch} ]; then
|
||||
. /etc/rc.${arch}
|
||||
fi
|
||||
|
||||
# Run rc.devfs if readable to customize devfs
|
||||
#
|
||||
if [ -r /etc/rc.devfs ]; then
|
||||
@ -523,6 +501,28 @@ if [ -r /etc/rc.local ]; then
|
||||
echo '.'
|
||||
fi
|
||||
|
||||
# For each valid dir in $local_startup, search for init scripts matching *.sh
|
||||
#
|
||||
case ${local_startup} in
|
||||
[Nn][Oo] | '')
|
||||
;;
|
||||
*)
|
||||
echo -n 'Local package initialization:'
|
||||
for dir in ${local_startup}; do
|
||||
if [ -d "${dir}" ]; then
|
||||
for script in ${dir}/*.sh; do
|
||||
if [ -x "${script}" ]; then
|
||||
(set -T
|
||||
trap 'exit 1' 2
|
||||
${script} start)
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
echo .
|
||||
;;
|
||||
esac
|
||||
|
||||
# Raise kernel security level. This should be done only after `fsck' has
|
||||
# repaired local file systems if you want the securelevel to be greater than 1.
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user