From c16d6d2f8dfbcd001182665d59d1572526c4684e Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Sun, 31 Aug 2014 06:40:47 +0000 Subject: Do not overwrite examplessum; use the one we are provided with. --- usr.sbin/sysmerge/sysmerge.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'usr.sbin/sysmerge/sysmerge.sh') diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 4a1f4670873..5cadbc9eb07 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.159 2014/08/30 20:31:03 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.160 2014/08/31 06:40:46 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot # Copyright (c) 1998-2003 Douglas Barton @@ -624,8 +624,7 @@ sm_check_an_eg() { local _egmods _i _j _managed EGMODS if [[ -f /usr/share/sysmerge/examplessum ]]; then - cp /usr/share/sysmerge/examplessum \ - ${_TMPROOT}/usr/share/sysmerge/examplessum + cp /usr/share/sysmerge/examplessum ${_WRKDIR}/examplessum _egmods=$(cd / && \ sha256 -c /usr/share/sysmerge/examplessum 2>/dev/null | \ grep 'FAILED$' | \ -- cgit v1.2.3