summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysupgrade
diff options
context:
space:
mode:
authorflorian <florian@openbsd.org>2019-06-21 16:50:26 +0000
committerflorian <florian@openbsd.org>2019-06-21 16:50:26 +0000
commit59a9bef7b57ab212856b31214d95ee7b925a6578 (patch)
tree5101e0b020bd32ec4bc3a6ae47a4cfc720917d69 /usr.sbin/sysupgrade
parentFurther improve the filesystem stability of kernel installation by KARL. (diff)
downloadwireguard-openbsd-59a9bef7b57ab212856b31214d95ee7b925a6578.tar.xz
wireguard-openbsd-59a9bef7b57ab212856b31214d95ee7b925a6578.zip
Try harder to have a complete /bsd.upgrade on disk.
Adapted from recent changes to the KARL infrastructure. OK deraadt, sthen
Diffstat (limited to 'usr.sbin/sysupgrade')
-rw-r--r--usr.sbin/sysupgrade/sysupgrade.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/sysupgrade/sysupgrade.sh b/usr.sbin/sysupgrade/sysupgrade.sh
index 3f8a7f92e19..0d7959d96ee 100644
--- a/usr.sbin/sysupgrade/sysupgrade.sh
+++ b/usr.sbin/sysupgrade/sysupgrade.sh
@@ -1,6 +1,6 @@
#!/bin/ksh
#
-# $OpenBSD: sysupgrade.sh,v 1.21 2019/05/14 14:27:49 ajacoutot Exp $
+# $OpenBSD: sysupgrade.sh,v 1.22 2019/06/21 16:50:26 florian Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015 Robert Peichaer <rpe@openbsd.org>
@@ -182,9 +182,8 @@ fi
${KEEP} && > keep
-cp bsd.rd /nbsd.upgrade
-ln -f /nbsd.upgrade /bsd.upgrade
-rm /nbsd.upgrade
+install -F -m 700 bsd.rd /bsd.upgrade
+sync
if ${REBOOT}; then
echo Upgrading.