Browse Source

Improve reorder_kernel()

- check for and exit if /usr/share is on a nfs mounted filesystem
- add trap handlers that mail the logfile to the admin user
- use $_compile instead of $_compile_dir like in the installer
- use $_compile/$_kernel instead of $_kernel_dir
- remove the now redundant sha256 -h ... after make newinstall
- write stdout/stderr of the background subshell to a logfile
OK tb@ deraadt@
OPENBSD_6_2
rpe 7 years ago
parent
commit
a17bb5c13f
1 changed files with 23 additions and 17 deletions
  1. +23
    -17
      src/etc/rc

+ 23
- 17
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.505 2017/06/27 03:42:00 tedu Exp $
# $OpenBSD: rc,v 1.506 2017/06/30 17:06:03 rpe Exp $
# System startup script run by init on autoboot or after single-user. # System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the # Output and error are redirected to console by init, and the console is the
@ -222,33 +222,39 @@ reorder_libs() {
# Re-link the kernel, placing the objects in a random order. # Re-link the kernel, placing the objects in a random order.
# Replace current with relinked kernel and inform root about it. # Replace current with relinked kernel and inform root about it.
reorder_kernel() { reorder_kernel() {
local _dkdev=$(df /usr/share | sed '1d;s/ .*//')
# Skip if /usr/share is on a nfs mounted filesystem.
[[ $(mount | grep "^$_dkdev") == *" type nfs "* ]] && return
( (
set -e set -e
_compile_dir=/usr/share/compile
trap 'trap - EXIT; mail -s "$(hostname) Kernel relink failed" root \
</var/log/kernel_relink.log' ERR
trap 'mail -s "$(hostname) Kernel relink info" root \
</var/log/kernel_relink.log' EXIT
_compile=/usr/share/compile
_kernel=$(sysctl -n kern.osversion) _kernel=$(sysctl -n kern.osversion)
_kernel=${_kernel%#*} _kernel=${_kernel%#*}
_kernel_dir=$_compile_dir/$_kernel
_sha256=/var/db/kernel.SHA256 _sha256=/var/db/kernel.SHA256
if [[ -f /usr/share/compile.tgz ]]; then
rm -rf $_compile_dir
mkdir -m 700 -p $_compile_dir
tar -C $_compile_dir -xzf /usr/share/compile.tgz $_kernel
rm -f /usr/share/compile.tgz
if [[ -f $_compile.tgz ]]; then
rm -rf $_compile
mkdir -m 700 -p $_compile
tar -C $_compile -xzf $_compile.tgz $_kernel
rm -f $_compile.tgz
fi fi
sha256 -q -C $_sha256 /bsd sha256 -q -C $_sha256 /bsd
cd $_kernel_dir
make newbsd >$_kernel_dir/log 2>&1
make newinstall >>$_kernel_dir/log 2>&1
(umask 077 && sha256 -h $_sha256 /bsd)
(echo "Kernel has been relinked and is active on next reboot\n"; \
cat $_sha256; echo "\nRelink log:\n"; cat $_kernel_dir/log ) |
mail -Es "$(hostname) Kernel relink info" root >/dev/null
cd $_compile/$_kernel
make newbsd
make newinstall
) >/dev/null 2>&1 &
echo "\nKernel has been relinked and is active on next reboot.\n"
cat $_sha256
) >/var/log/kernel_relink.log 2>&1 &
} }
# Run rc.* script and email output to root. # Run rc.* script and email output to root.


Loading…
Cancel
Save