=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openbsd/fw_update/fw_install.sh 2021/10/17 20:29:01 1.12 +++ openbsd/fw_update/fw_install.sh 2021/10/17 20:49:16 1.13 @@ -177,7 +177,7 @@ while read c g; do case $c in - @cwd) cwd=$g + @cwd) cwd="${DESTDIR}/$g" ;; @*) continue ;; @@ -200,7 +200,7 @@ # TODO: Add some details about the install to +CONTENTS like pkg_add # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall echo "Installing $_f" - tar -zxphf "$_tmpsrc/$_f" -C /etc "firmware/*" + tar -zxphf "$_tmpsrc/$_f" -C "${DESTDIR}/etc" "firmware/*" mkdir -p ${PKGDIR}/${_f%.tgz}/ tar -zxphf "$_tmpsrc/$_f" -C "${PKGDIR}/${_f%.tgz}" "+*" ed -s "${PKGDIR}/${_f%.tgz}/+CONTENTS" <