diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2017-11-09 14:59:08 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2017-11-09 14:59:08 +0000 |
| commit | 015e0cd23082e6081e4f763e9cb9b76b77092a15 (patch) | |
| tree | 0e1d53c1d43e67f0c54abdb06e7e9ba1f2501991 | |
| parent | e14d9204353c6e8e6e42a045f5575caf66fdeaf1 (diff) | |
/usr/share/compile -> /usr/share/relink/kernel
from semarie
I meant to do that at p2k17 but totally forgot...
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index d4f7af5e437..3b5cc4b8ab0 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.132 2017/10/13 06:16:27 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.133 2017/11/09 14:59:07 ajacoutot Exp $ # # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -42,8 +42,8 @@ apply_patch() echo "Installing patch ${_patch##${_OSrev}-}" install -d ${_edir} ${_PDIR}/${_patch} - ${_BSDMP} && _s="-s @usr/share/compile/GENERIC/.*@@g" || - _s="-s @usr/share/compile/GENERIC.MP/.*@@g" + ${_BSDMP} && _s="-s @usr/share/relink/kernel/GENERIC/.*@@g" || + _s="-s @usr/share/relink/kernel/GENERIC.MP/.*@@g" _files="$(tar -xvzphf ${_TMP}/syspatch${_patch}.tgz -C ${_edir} ${_s})" checkfs ${_files} @@ -64,7 +64,7 @@ apply_patch() trap exit INT echo ${_files} | grep -Eqv \ - '(^|[[:blank:]]+)usr/share/compile/GENERI(C|C.MP)/[[:print:]]+([[:blank:]]+|$)' || + '(^|[[:blank:]]+)usr/share/relink/kernel/GENERI(C|C.MP)/[[:print:]]+([[:blank:]]+|$)' || _KARL=true ! ${_upself} || sp_err "syspatch updated itself, run it again to \ @@ -206,7 +206,7 @@ rollback_patch() trap exit INT echo ${_files} | grep -Eqv \ - '(^|[[:blank:]]+)usr/share/compile/GENERI(C|C.MP)/[[:print:]]+([[:blank:]]+|$)' || + '(^|[[:blank:]]+)usr/share/relink/kernel/GENERI(C|C.MP)/[[:print:]]+([[:blank:]]+|$)' || _KARL=true } |