summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-03-01 13:47:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-03-01 13:47:27 +0000
commit2789e86f4d95bebca409929f753dedc645ab1d1b (patch)
treebdc46bcb1ec3735ac0740561f4c953f254a26b1e /usr.sbin/sysmerge
parent3da33324b72e2478f8df7e3ef0ad0d733583aaf9 (diff)
start using the new officially named keys. This is being done before
any snapshots come out which are signed with that key... but just give it a day or two. from ajacoutot
Diffstat (limited to 'usr.sbin/sysmerge')
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index 1bfc52bb69c..26a5a387a0d 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.121 2014/02/08 23:58:06 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.122 2014/03/01 13:47:26 deraadt Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@ -80,7 +80,7 @@ error_rm_wrkdir() {
(($#)) && echo "**** ERROR: $@"
# do not remove the entire WRKDIR in case sysmerge stopped half
# way since it contains our backup files
- rm -f ${WRKDIR}/{,x}etc-${SIGHASH}{,.sig}
+ rm -f ${WRKDIR}/*${SIGHASH}{,.sig}
rm -f ${WRKDIR}/*.tgz
rmdir ${WRKDIR} 2>/dev/null
exit 1
@@ -147,7 +147,7 @@ get_set() {
# takes the signature file and set as arguments
check_sig() {
local _sigfile=${1##*/} _tgz=${2##*/}
- local _key="/etc/signify/${RELINT}base.pub"
+ local _key="/etc/signify/openbsd-${RELINT}-base.pub"
echo "===> Verifying ${_tgz} signature and checksum"
(cd ${WRKDIR} && \
signify -V -e -p ${_key} -x "${_sigfile}.sig" -m ${_sigfile} >/dev/null) || \