=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.98 retrieving revision 1.127 diff -u -r1.98 -r1.127 --- openbsd/fw_update/fw_install.sh 2021/12/21 02:38:00 1.98 +++ openbsd/fw_update/fw_install.sh 2021/12/25 02:38:33 1.127 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.98 2021/12/21 02:38:00 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.127 2021/12/25 02:38:33 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -35,10 +35,20 @@ FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub VERBOSE=false +DELETE=false DOWNLOAD=true INSTALL=true LOCALSRC= +unset FTPPID +REMOVE_LOCALSRC=false +cleanup() { + set +o errexit # ignore errors from killing ftp + [ "${FTPPID:-}" ] && kill -TERM -"$FTPPID" #2>/dev/null + "$REMOVE_LOCALSRC" && rm -rf "$LOCALSRC" +} +trap cleanup EXIT + tmpdir() { local _i=1 _dir @@ -56,27 +66,27 @@ } fetch() { - local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error='' + 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. set -o monitor # make sure ftp gets its own process group ( + flags=-VM + "$VERBOSE" && flags=-vm if [ -x /usr/bin/su ]; then exec /usr/bin/su -s /bin/ksh "$_user" -c \ - "/usr/bin/ftp -D 'Get/Verify' -Vm -o- '$_src'" > "$_dst" + "/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $flags -o- '$_src'" > "$_dst" else exec /usr/bin/doas -u "$_user" \ - /usr/bin/ftp -D 'Get/Verify' -Vm -o- "$_src" > "$_dst" + /usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $flags -o- "$_src" > "$_dst" fi - ) & _pid=$! + ) & FTPPID=$! set +o monitor - trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM - SECONDS=0 _last=0 - while kill -0 -"$_pid" 2>/dev/null; do + while kill -0 -"$FTPPID" 2>/dev/null; do if [[ $SECONDS -gt 12 ]]; then set -- $( ls -ln "$_dst" 2>/dev/null ) if [[ $_last -ne $5 ]]; then @@ -84,7 +94,7 @@ SECONDS=0 sleep 1 else - kill -INT -"$_pid" + kill -INT -"$FTPPID" _error=" (timed out)" fi else @@ -93,11 +103,11 @@ done set +o errexit - wait "$_pid" + wait "$FTPPID" _exit=$? set -o errexit - trap "" EXIT INT QUIT ABRT TERM + unset FTPPID if [ "$_exit" -ne 0 ]; then rm -f "$_dst" @@ -114,7 +124,7 @@ fi } -devices_needing_firmware() { +firmware_in_dmesg() { local _d _m _line _dmesgtail _last='' _nl=$( echo ) # When we're not in the installer, the dmesg.boot can @@ -149,24 +159,59 @@ } installed_firmware() { - set +o noglob - for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do - [ -e "$fw/+CONTENTS" ] || continue + local _pre="$1" _match="$2" _post="$3" _firmware + set -sA _firmware -- $( + set +o noglob + grep -Fxl '@option firmware' \ + "${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \ + 2>/dev/null || true + set -o noglob + ) + + [ "${_firmware[*]:-}" ] || return 0 + for fw in "${_firmware[@]}"; do + fw="${fw%/+CONTENTS}" echo "${fw##*/}" done - set -o noglob } +detect_firmware() { + local _devices _last='' _d + + set -sA _devices -- $( + firmware_in_dmesg + for _d in $( installed_firmware '*' '-firmware-' '*' ); do + echo "$( firmware_devicename "$_d" )" + done + ) + + [ "${_devices[*]:-}" ] || return 0 + for _d in "${_devices[@]}"; do + [[ $_last = $_d ]] && continue + echo $_d + _last="$_d" + done +} + add_firmware () { - local _f="${1##*/}" - local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}" - ftp -D "Install" -Vmo- "file:${1}" | - tar -s ",^\+,${_pkgdir}/+," \ + local _f="${1##*/}" _pkgname + local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )" + local flags=-VM + "$VERBOSE" && flags=-vm + ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" | + tar -s ",^\+,${_tmpdir}/+," \ -s ",^firmware,${DESTDIR}/etc/firmware," \ -C / -zxphf - "+*" "firmware/*" + _pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )" + if [ ! "$_pkgname" ]; then + echo "Failed to extract name from $1, partial install" 2>&1 + rm -rf "$_tmpdir" + return 1 + fi + # TODO: Should we mark these so real fw_update can -Drepair? - ed -s "${_pkgdir}/+CONTENTS" <&2 + return 2 + fi + set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}" while read -r c g; do @@ -212,60 +266,130 @@ } usage() { - echo "usage: ${0##*/} [-D | -L] [driver | file ...]" + echo "usage: ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]" exit 2 } +ALL=false OPT_D= -OPT_L= -while getopts DL name +while getopts :adDp:v name do case "$name" in + a) ALL=true ;; + d) DELETE=true ;; D) OPT_D=true ;; - L) OPT_L=true ;; + p) LOCALSRC="$OPTARG" ;; v) VERBOSE=true ;; - ?) usage 2 ;; + :) + echo "${0##*/}: option requires an argument -- -$OPTARG" >&2 + usage 2 + ;; + ?) + echo "${0##*/}: unknown option -- -$OPTARG" >&2 + usage 2 + ;; esac done shift $((OPTIND - 1)) -[ "$OPT_D" ] && [ "$OPT_L" ] && usage 1 +if [ "$LOCALSRC" ]; then + if [[ $LOCALSRC = @(ftp|http?(s))://* ]]; then + FWURL="${LOCALSRC}" + LOCALSRC= + else + LOCALSRC="${LOCALSRC:#file:}" + ! [ -d "$LOCALSRC" ] && + echo "The path must be a URL or an existing directory" >&2 && + exit 2 + fi +fi +# "Download only" means local dir and don't install if [ "$OPT_D" ]; then - # "Download only" means local dir and don't install INSTALL=false - LOCALSRC=. -elif [ "$OPT_L" ]; then - # "Local" means don't download, install from local dir - DOWNLOAD=false - LOCALSRC=. -else - LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )" + LOCALSRC="${LOCALSRC:-.}" fi -CFILE="$LOCALSRC/$CFILE" - -if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then +if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then echo "need root privileges" >&2 exit 1 fi -set -A devices -- "$@" +set -sA devices -- "$@" -if [ ! "${devices[*]:-}" ]; then - echo -n "Detecting firmware ..." - set -A devices -- $( devices_needing_firmware ) - [ "${devices[*]:-}" ] && echo " found." || echo " done." +if "$DELETE"; then + [ "$OPT_D" ] && usage 22 + + set -A installed + if [ "${devices[*]:-}" ]; then + "$ALL" && usage 22 + + set -A installed -- $( + for d in "${devices[@]}"; do + f="${d##*/}" # only care about the name + f="${f%.tgz}" # allow specifying the package name + [ "$( firmware_devicename "$f" )" = "$f" ] && f="$f-firmware" + + set -A i -- $( installed_firmware '' "$f-" '*' ) + + if [ "${i[*]:-}" ]; then + echo "${i[@]}" + else + echo "No firmware found for '$d'" >&2 + fi + done + ) + elif "$ALL"; then + set -A installed -- $( installed_firmware '*' '-firmware-' '*' ) + fi + + deleted='' + if [ "${installed:-}" ]; then + for fw in "${installed[@]}"; do + delete_firmware "$fw" || continue + deleted="$deleted,$( firmware_devicename "$fw" )" + done + fi + + deleted="${deleted:+${deleted#,}}" + echo "${0:##*/}: deleted ${deleted:-none}"; + + exit fi +if [ ! "$LOCALSRC" ]; then + LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" + REMOVE_LOCALSRC=true +fi + +CFILE="$LOCALSRC/$CFILE" + +if [ "${devices[*]:-}" ]; then + "$ALL" && usage 22 +else + "$VERBOSE" && echo -n "Detecting firmware ..." + set -sA devices -- $( detect_firmware ) + "$VERBOSE" && + { [ "${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" )" @@ -278,12 +402,13 @@ exit 2 fi - set -A installed -- $( installed_firmware "$d" ) + set -A installed -- $( installed_firmware '' "$d-firmware-" '*' ) if "$INSTALL" && [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do if [ "${f##*/}" = "$i.tgz" ]; then - echo "$i already installed" + "$VERBOSE" && echo "$i already installed" + kept="$kept,$d" continue 2 fi done @@ -291,13 +416,15 @@ if [ -e "$f" ]; then if "$DOWNLOAD"; then - echo "Verify existing ${f##*/}" + "$VERBOSE" && echo "Verify existing ${f##*/}" verify "$f" || continue + "$INSTALL" || kept="$kept,$d" # else assume it was verified when downloaded fi elif "$DOWNLOAD"; then fetch "$f" || continue verify "$f" || continue + "$INSTALL" || added="$added,$d" elif "$INSTALL"; then echo "Cannot install ${f##*/}, not found" >&2 continue @@ -305,12 +432,28 @@ "$INSTALL" || continue + removed=false if [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do delete_firmware "$i" + removed=true done fi add_firmware "$f" + + if "$removed"; then + updated="$updated,$d" + else + added="$added,$d" + fi done +added="${added:#,}" +updated="${updated:#,}" +kept="${kept:#,}" +if "$INSTALL"; then + echo "${0##*/}: added ${added:-none}; updated ${updated:-none}; kept ${kept:-none}" +else + echo "${0##*/}: downloaded ${added:-none}; kept ${kept:-none}" +fi