=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.138 retrieving revision 1.149 diff -u -r1.138 -r1.149 --- openbsd/fw_update/fw_install.sh 2021/12/26 18:58:54 1.138 +++ openbsd/fw_update/fw_install.sh 2022/01/14 04:25:46 1.149 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.138 2021/12/26 18:58:54 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.149 2022/01/14 04:25:46 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -55,8 +55,7 @@ tmpdir() { local _i=1 _dir - # If we're not in the installer, - # we have mktemp and a more hostile environment. + # The installer lacks mktemp(1), do it by hand if [ -x /usr/bin/mktemp ]; then _dir=$( mktemp -d "${1}-XXXXXXXXX" ) else @@ -71,8 +70,7 @@ fetch() { local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _exit _error='' - # If we're not in the installer, - # we have su(1) and doas(1) is unlikely to be configured. + # The installer uses a limited doas(1) as a tiny su(1) set -o monitor # make sure ftp gets its own process group ( _flags=-vm @@ -120,21 +118,40 @@ 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() { - # On the installer we don't get sha256 -C, so fake it. + [ -e "$CFILE" ] || fetch_cfile || return 1 + # The installer sha256 lacks -C, do it by hand 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() { local _d _m _line _dmesgtail _last='' _nl=$( echo ) - # When we're not in the installer, the dmesg.boot can - # contain multiple boots, so only look in the last one + # The dmesg can contain multiple boots, only look in the last one _dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )" grep -v '^[[:space:]]*#' "$FWPATTERNS" | @@ -152,6 +169,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" @@ -199,7 +217,7 @@ } add_firmware () { - local _f="${1##*/}" _pkgname + local _f="${1##*/}" _m="${2:-Install}" _pkgname FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )" local _flags=-vm case "$VERBOSE" in @@ -207,9 +225,7 @@ 2|3) _flags=-Vm ;; esac - [ "$VERBOSE" -eq 1 ] && echo -n "Install ${_f} ..." - - ftp -N "${0##/}" -D "Install" "$_flags" -o- "file:${1}" | + ftp -N "${0##/}" -D "$_m" "$_flags" -o- "file:${1}" | tar -s ",^\+,${FWPKGTMP}/+," \ -s ",^firmware,${DESTDIR}/etc/firmware," \ -C / -zxphf - "+*" "firmware/*" @@ -222,7 +238,6 @@ return 1 fi - # TODO: Should we mark these so real fw_update can -Drepair? ed -s "${FWPKGTMP}/+CONTENTS" <&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)) @@ -323,9 +337,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 @@ -338,8 +363,11 @@ set -sA devices -- "$@" if "$DELETE"; then - [ "$OPT_D" ] && usage 22 + [ "$OPT_F" ] && usage 22 + # Show the "Uninstalling" message when just deleting not upgrading + [ "$VERBOSE" -gt 0 ] && VERBOSE=3 + set -A installed if [ "${devices[*]:-}" ]; then "$ALL" && usage 22 @@ -375,15 +403,15 @@ done fi - deleted="${deleted:+${deleted#,}}" + deleted="${deleted#,}" echo "${0:##*/}: deleted ${deleted:-none}"; exit fi if [ ! "$LOCALSRC" ]; then - LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" - REMOVE_LOCALSRC=true + LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" + REMOVE_LOCALSRC=true fi CFILE="$LOCALSRC/$CFILE" @@ -391,32 +419,21 @@ if [ "${devices[*]:-}" ]; then "$ALL" && usage 22 else - [ "$VERBOSE" -gt 0 ] && echo -n "Detect firmware ..." + [ "$VERBOSE" -gt 1 ] && echo -n "Detect firmware ..." set -sA devices -- $( detect_firmware ) - [ "$VERBOSE" -gt 0 ] && + [ "$VERBOSE" -gt 1 ] && { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; } fi [ "${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=true if [ "$f" = "$d" ]; then f=$( firmware_filename "$d" || true ) [ "$f" ] || continue @@ -424,6 +441,9 @@ elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then echo "Cannot download local file $f" >&2 exit 2 + else + # Don't verify files specified on the command-line + verify_existing=false fi set -A installed -- $( installed_firmware '' "$d-firmware-" '*' ) @@ -431,21 +451,31 @@ if "$INSTALL" && [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do if [ "${f##*/}" = "$i.tgz" ]; then - [ "$VERBOSE" -gt 0 ] && echo "Keep $i" + [ "$VERBOSE" -gt 2 ] && echo "Keep $i" kept="$kept,$d" continue 2 fi done fi - if [ -e "$f" ]; then - if "$DOWNLOAD"; then - [ "$VERBOSE" -gt 0 ] && ! "$INSTALL" && - echo "Keep/Verify ${f##*/}" - "$DRYRUN" || verify "$f" || continue + if "$verify_existing" && [ -e "$f" ]; then + msg="Keep/Verify" + "$INSTALL" && msg="Verify" + [ "$VERBOSE" -gt 1 ] && ! "$INSTALL" && + echo "$msg ${f##*/}" + + if "$DRYRUN" || verify "$f"; then "$INSTALL" || kept="$kept,$d" - # else assume it was verified when downloaded + elif "$DOWNLOAD"; then + [ "$VERBOSE" -gt 0 ] && echo "Refetching $f" + rm -f $f + else + continue fi + fi + + if [ -e "$f" ]; then + true # verified above elif "$DOWNLOAD"; then if "$DRYRUN"; then [ "$VERBOSE" -gt 0 ] && echo "Get/Verify ${f##*/}" @@ -454,7 +484,7 @@ fetch "$f" && verify "$f" || { [ "$VERBOSE" -eq 1 ] && echo " failed."; continue; } - [ "$VERBOSE" -eq 1 ] && echo " done." + [ "$VERBOSE" -eq 1 ] && ! "$INSTALL" && echo " done." fi "$INSTALL" || added="$added,$d" elif "$INSTALL"; then @@ -464,23 +494,35 @@ "$INSTALL" || continue - removed=false + update='' if [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do "$DRYRUN" || delete_firmware "$i" - removed=true + update="Update" done fi - "$DRYRUN" || add_firmware "$f" + "$DRYRUN" || add_firmware "$f" "$update" f="${f##*/}" f="${f%.tgz}" - if "$removed"; then - "$DRYRUN" && [ "$VERBOSE" -gt 0 ] && echo "Update $f" + if [ "$update" ]; then + if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then + echo " updated." + elif [ "$VERBOSE" -eq 1 ]; then + echo "Update $f" + elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then + echo "Update $f" + fi updated="$updated,$d" else - "$DRYRUN" && [ "$VERBOSE" -gt 0 ] && echo "Install $f" + if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then + echo " installed." + elif [ "$VERBOSE" -eq 1 ]; then + echo "Install $f" + elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then + echo "Install $f" + fi added="$added,$d" fi done