Browse Source

Adjust relink procedure to use new targets. Better use semantics for

users and developers.
diff from rpe, ok tb
OPENBSD_6_2
deraadt 7 years ago
parent
commit
c6e0121799
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      src/etc/rc

+ 5
- 5
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.503 2017/06/19 22:50:50 deraadt Exp $
# $OpenBSD: rc,v 1.504 2017/06/22 16:03:36 deraadt 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
@ -228,7 +228,7 @@ reorder_kernel() {
_kernel=$(sysctl -n kern.osversion) _kernel=$(sysctl -n kern.osversion)
_kernel=${_kernel%#*} _kernel=${_kernel%#*}
_kernel_dir=$_compile_dir/$_kernel _kernel_dir=$_compile_dir/$_kernel
_sha256=$_kernel_dir/SHA256
_sha256=/var/db/kernel.SHA256
if [[ -f /usr/share/compile.tgz ]]; then if [[ -f /usr/share/compile.tgz ]]; then
rm -rf $_compile_dir rm -rf $_compile_dir
@ -237,12 +237,12 @@ reorder_kernel() {
rm -f /usr/share/compile.tgz rm -f /usr/share/compile.tgz
fi fi
[[ -f $_sha256 ]] && sha256 -q -C $_sha256 /bsd
sha256 -q -C $_sha256 /bsd
cd $_kernel_dir cd $_kernel_dir
make newbsd >$_kernel_dir/log 2>&1 make newbsd >$_kernel_dir/log 2>&1
make install >>$_kernel_dir/log 2>&1
sha256 -h $_sha256 /bsd
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"; \ (echo "Kernel has been relinked and is active on next reboot\n"; \
cat $_sha256; echo "\nRelink log:\n"; cat $_kernel_dir/log ) | cat $_sha256; echo "\nRelink log:\n"; cat $_kernel_dir/log ) |


Loading…
Cancel
Save