diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-09-07 09:34:57 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-09-07 09:34:57 +0000 |
| commit | 324a09ffda5af4380a9cefec4ce2415545b928fa (patch) | |
| tree | 04c8cd57605b1a50c74156412496dd864bd63e67 | |
| parent | ec940873d0295b977028dd6c55ae18a6d838f758 (diff) | |
No need to restore backup of sum files; once the new ones are installed,
it means we already processed all relevant files.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index dd35d5d203d..11fdde003ac 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.202 2015/08/24 12:16:36 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.203 2015/09/07 09:34:56 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -38,17 +38,6 @@ stripcom() { sm_error() { (($#)) && echo "!!!! ERROR: $@" - - # restore sum files from backups or remove the newly created ones - for _i in ${_WRKDIR}/{etcsum,xetcsum,examplessum,pkgsum}; do - _j=$(basename ${_i}) - if [[ -f ${_i} ]]; then - mv ${_i} /var/sysmerge/${_j} - elif [[ -f /var/sysmerge/${_j} ]]; then - rm /var/sysmerge/${_j} - fi - done - rm -rf ${_WRKDIR} exit 1 } @@ -68,9 +57,6 @@ sm_extract_sets() { [[ -z ${_e}${_x} ]] && sm_error "cannot find sets to extract" for _set in ${_e} ${_x}; do - [[ -f /var/sysmerge/${_set}sum ]] && \ - cp /var/sysmerge/${_set}sum \ - ${_WRKDIR}/${_set}sum tar -xzphf \ /var/sysmerge/${_set}.tgz || \ sm_error "failed to extract ${_set}.tgz" @@ -143,9 +129,6 @@ sm_cp_pkg_samples() { ! ${PKGMODE} && return local _install_args _i _ret=0 _sample - [[ -f /var/sysmerge/pkgsum ]] && \ - cp /var/sysmerge/pkgsum ${_WRKDIR}/pkgsum - # access to full base system hierarchy is implied in packages mtree -qdef /etc/mtree/4.4BSD.dist -U >/dev/null mtree -qdef /etc/mtree/BSD.x11.dist -U >/dev/null @@ -579,7 +562,6 @@ sm_check_an_eg() { local _egmods _i _managed if [[ -f /var/sysmerge/examplessum ]]; then - cp /var/sysmerge/examplessum ${_WRKDIR}/examplessum _egmods=$(cd / && \ sha256 -c /var/sysmerge/examplessum 2>/dev/null | \ sed -n 's/^(SHA256) \(.*\): FAILED$/\1/p') |