diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-31 06:40:47 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-31 06:40:47 +0000 |
| commit | c16d6d2f8dfbcd001182665d59d1572526c4684e (patch) | |
| tree | 287c8b7bc1d1bffef5447cf1b96672c4cd99cd05 /usr.sbin | |
| parent | bed3078c21ce067e35428534af6d6b7ffef8dcb6 (diff) | |
Do not overwrite examplessum; use the one we are provided with.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 5 |
1 files changed, 2 insertions, 3 deletions
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 <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -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$' | \ |