diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2016-09-07 15:41:24 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2016-09-07 15:41:24 +0000 |
| commit | 247a814f095ebee8845953cb6cbc4eb07c5b4c11 (patch) | |
| tree | 69e2a4d4fca2a8c6c25ab073181ee678fe148d1f /usr.sbin | |
| parent | 2b60d4b84ece282a5845b7f79ee2c72aac315ce8 (diff) | |
Don't put bsd.mp twice in the GENERIC.MP rollback tarball.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index f954d5053fe..55411487249 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.9 2016/09/07 15:19:33 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.10 2016/09/07 15:41:23 ajacoutot Exp $ # # Copyright (c) 2016 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -68,13 +68,12 @@ create_rollback() done (cd / && \ + # GENERIC.MP: substitute bsd.mp->bsd and bsd.sp->bsd if ${_BSDMP} && \ tar -tzf ${_TMP}/${_patch}.tgz bsd >/dev/null 2>&1; then - # GENERIC.MP: substitute bsd.mp->bsd and bsd.sp->bsd - # XXX bsd.mp created twice in the tarball tar -czf ${_PDIR}/${_REL}/rollback-${_patch}.tgz \ - -s '/^bsd$/bsd.mp/' -s '/^bsd.sp$/bsd/' \ - ${_rbfiles} bsd.sp 2>/dev/null # no /bsd.mp + -s '/^bsd.mp$//' -s '/^bsd$/bsd.mp/' \ + -s '/^bsd.sp$/bsd/' bsd.sp ${_rbfiles} else tar -czf ${_PDIR}/${_REL}/rollback-${_patch}.tgz \ ${_rbfiles} |