diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2019-09-08 13:30:46 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2019-09-08 13:30:46 +0000 |
| commit | dafb0f511b50977f7494421ff9e96bcf6e1901d6 (patch) | |
| tree | e23b953f66e81ed9da6a7cb84d042cfa5f2d99e9 | |
| parent | We can't call cpu_ucode_apply() before we call cpu_ucode_setup(). (diff) | |
| download | wireguard-openbsd-dafb0f511b50977f7494421ff9e96bcf6e1901d6.tar.xz wireguard-openbsd-dafb0f511b50977f7494421ff9e96bcf6e1901d6.zip | |
Have sm_install() use install -F (fsync).
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index ea8dbc3479a..d4e9934e8dc 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.233 2017/10/28 07:22:56 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.234 2019/09/08 13:30:46 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -311,7 +311,7 @@ sm_install() { cp -p ${TARGET} ${_BKPDIR}/${_instdir} || return fi - if ! install -m ${_fmode} -o ${_fown} -g ${_fgrp} ${COMPFILE} ${_instdir}; then + if ! install -Fm ${_fmode} -o ${_fown} -g ${_fgrp} ${COMPFILE} ${_instdir}; then rm ${_BKPDIR}/${COMPFILE} && return 1 fi rm ${COMPFILE} |