=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.139 retrieving revision 1.147 diff -u -r1.139 -r1.147 --- openbsd/fw_update/fw_install.sh 2022/01/05 23:34:11 1.139 +++ openbsd/fw_update/fw_install.sh 2022/01/09 03:02:38 1.147 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.139 2022/01/05 23:34:11 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.147 2022/01/09 03:02:38 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -120,14 +120,34 @@ echo "Cannot fetch $_src$_error" >&2 return 1 fi + + return 0 } +fetch_cfile() { + if "$DOWNLOAD"; then + set +o noclobber # we want to get the latest CFILE + fetch "$CFILE" || return 1 + set -o noclobber + ! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" && + echo "Signature check of SHA256.sig failed" >&2 && return 1 + elif [ ! -e "$CFILE" ]; then + echo "${0##*/}: $CFILE: No such file or directory" >&2 + return 2 + fi + + return 0 +} + verify() { + [ -e "$CFILE" ] || fetch_cfile || return 1 # On the installer we don't get sha256 -C, so fake it. if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then echo "Checksum test for ${1##*/} failed." >&2 return 1 fi + + return 0 } firmware_in_dmesg() { @@ -152,6 +172,7 @@ firmware_filename() { local _f + [ -e "$CFILE" ] || fetch_cfile || return 1 _f="$( sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d' )" ! [ "$_f" ] && echo "Unable to find firmware for $1" >&2 && return 1 echo "$_f" @@ -239,7 +260,7 @@ local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg" # TODO: Check hash for files before deleting - [ "$VERBOSE" -gt 1 ] && echo -n "Uninstall $_pkg ..." + [ "$VERBOSE" -gt 2 ] && echo -n "Uninstall $_pkg ..." _cwd="${_pkgdir}/$_pkg" if [ ! -e "$_cwd/+CONTENTS" ] || @@ -275,36 +296,36 @@ fi done - [ "$VERBOSE" -gt 1 ] && echo " done." + [ "$VERBOSE" -gt 2 ] && echo " done." return 0 } usage() { - echo "usage: ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]" + echo "usage: ${0##*/} [-d | -F] [-av] [-p path] [driver | file ...]" exit 2 } ALL=false -OPT_D= -while getopts :adDnp:v name +OPT_F= +while getopts :adFnp:v name do - case "$name" in - a) ALL=true ;; - d) DELETE=true ;; - D) OPT_D=true ;; - n) DRYRUN=true ;; - p) LOCALSRC="$OPTARG" ;; - v) VERBOSE=$(( VERBOSE + 1 )) ;; - :) - echo "${0##*/}: option requires an argument -- -$OPTARG" >&2 - usage 2 - ;; - ?) - echo "${0##*/}: unknown option -- -$OPTARG" >&2 - usage 2 - ;; - esac + case "$name" in + a) ALL=true ;; + d) DELETE=true ;; + F) OPT_F=true ;; + n) DRYRUN=true ;; + p) LOCALSRC="$OPTARG" ;; + v) VERBOSE=$(( VERBOSE + 1 )) ;; + :) + echo "${0##*/}: option requires an argument -- -$OPTARG" >&2 + usage 2 + ;; + ?) + echo "${0##*/}: unknown option -- -$OPTARG" >&2 + usage 2 + ;; + esac done shift $((OPTIND - 1)) @@ -321,9 +342,20 @@ fi # "Download only" means local dir and don't install -if [ "$OPT_D" ]; then +if [ "$OPT_F" ]; then INSTALL=false LOCALSRC="${LOCALSRC:-.}" + + # Always check for latest CFILE and so latest firmware + if [ -e "$LOCALSRC/$CFILE" ]; then + mv "$LOCALSRC/$CFILE" "$LOCALSRC/$CFILE-OLD" + if fetch_cfile; then + rm -f "$LOCALSRC/$CFILE-OLD" + else + mv "$LOCALSRC/$CFILE-OLD" "$LOCALSRC/$CFILE" + echo "Using existing $CFILE" >&2 + fi + fi elif [ "$LOCALSRC" ]; then DOWNLOAD=false fi @@ -336,10 +368,10 @@ set -sA devices -- "$@" if "$DELETE"; then - [ "$OPT_D" ] && usage 22 + [ "$OPT_F" ] && usage 22 # Show the "Uninstalling" message when just deleting not upgrading - [ "$VERBOSE" -eq 1 ] && VEROBOSE=2 + [ "$VERBOSE" -gt 0 ] && VERBOSE=3 set -A installed if [ "${devices[*]:-}" ]; then @@ -383,8 +415,8 @@ fi if [ ! "$LOCALSRC" ]; then - LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" - REMOVE_LOCALSRC=true + LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" + REMOVE_LOCALSRC=true fi CFILE="$LOCALSRC/$CFILE" @@ -400,24 +432,13 @@ [ "${devices[*]:-}" ] || exit -if "$DOWNLOAD"; then - set +o noclobber # we want to get the latest CFILE - fetch "$CFILE" - set -o noclobber - ! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" && - echo "Signature check of SHA256.sig failed" >&2 && exit 1 -elif [ ! -e "$CFILE" ]; then - # TODO: We shouldn't need a CFILE if all arguments are files. - echo "${0##*/}: $CFILE: No such file or directory" >&2 - exit 2 -fi - added='' updated='' kept='' for f in "${devices[@]}"; do d="$( firmware_devicename "$f" )" + verify_existing="$DOWNLOAD" if [ "$f" = "$d" ]; then f=$( firmware_filename "$d" || true ) [ "$f" ] || continue @@ -425,6 +446,10 @@ elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then echo "Cannot download local file $f" >&2 exit 2 + else + # If someone specified a filename on the command-line + # we don't want to verify it. + verify_existing=false fi set -A installed -- $( installed_firmware '' "$d-firmware-" '*' ) @@ -441,9 +466,14 @@ if [ -e "$f" ]; then if "$DOWNLOAD"; then - [ "$VERBOSE" -gt 0 ] && ! "$INSTALL" && - echo "Keep/Verify ${f##*/}" - "$DRYRUN" || verify "$f" || continue + if "$verify_existing" && ! "$DRYRUN"; then + [ "$VERBOSE" -gt 1 ] && ! "$INSTALL" && + echo "Keep/Verify ${f##*/}" + verify "$f" || continue + else + [ "$VERBOSE" -gt 1 ] && ! "$INSTALL" && + echo "Keep ${f##*/}" + fi "$INSTALL" || kept="$kept,$d" # else assume it was verified when downloaded fi @@ -478,17 +508,21 @@ f="${f##*/}" f="${f%.tgz}" if [ "$update" ]; then - if [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then - echo "Update $f" + if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then + echo " updated." elif [ "$VERBOSE" -eq 1 ]; then - echo " updated." + echo "Update $f" + elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then + echo "Update $f" fi updated="$updated,$d" else - if [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then - echo "Install $f" + if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then + echo " installed." elif [ "$VERBOSE" -eq 1 ]; then - echo " installed." + echo "Install $f" + elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then + echo "Install $f" fi added="$added,$d" fi