=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.122 retrieving revision 1.140 diff -u -r1.122 -r1.140 --- openbsd/fw_update/fw_install.sh 2021/12/24 02:36:13 1.122 +++ openbsd/fw_update/fw_install.sh 2022/01/06 01:25:12 1.140 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.122 2021/12/24 02:36:13 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.140 2022/01/06 01:25:12 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -34,12 +34,24 @@ FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR} FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub -VERBOSE=false +DRYRUN=false +VERBOSE=0 DELETE=false DOWNLOAD=true INSTALL=true LOCALSRC= +unset FTPPID +unset FWPKGTMP +REMOVE_LOCALSRC=false +cleanup() { + set +o errexit # ignore errors from killing ftp + [ "${FTPPID:-}" ] && kill -TERM -"$FTPPID" 2>/dev/null + [ "${FWPKGTMP:-}" ] && rm -rf "$FWPKGTMP" + "$REMOVE_LOCALSRC" && rm -rf "$LOCALSRC" +} +trap cleanup EXIT + tmpdir() { local _i=1 _dir @@ -57,29 +69,30 @@ } 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 + _flags=-vm + case "$VERBOSE" in + 0|1) _flags=-VM ;; + 2) _flags=-Vm ;; + esac if [ -x /usr/bin/su ]; then exec /usr/bin/su -s /bin/ksh "$_user" -c \ - "/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $flags -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 -N "${0##/}" -D 'Get/Verify' $flags -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 @@ -87,7 +100,7 @@ SECONDS=0 sleep 1 else - kill -INT -"$_pid" + kill -INT -"$FTPPID" 2>/dev/null _error=" (timed out)" fi else @@ -96,11 +109,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" @@ -117,13 +130,12 @@ 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 # contain multiple boots, so only look in the last one - _dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot | - grep -e "^[a-z][a-z]*[0-9]" -e " not configured " )" + _dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )" grep -v '^[[:space:]]*#' "$FWPATTERNS" | while read -r _d _m; do @@ -153,7 +165,7 @@ installed_firmware() { local _pre="$1" _match="$2" _post="$3" _firmware - set -A _firmware -- $( + set -sA _firmware -- $( set +o noglob grep -Fxl '@option firmware' \ "${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \ @@ -168,25 +180,48 @@ done } +detect_firmware() { + local _devices _last='' _d + + set -sA _devices -- $( + firmware_in_dmesg + for _d in $( installed_firmware '*' '-firmware-' '*' ); do + 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##*/}" _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}/+," \ + local _f="${1##*/}" _m="${2:-Install}" _pkgname + FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )" + local _flags=-vm + case "$VERBOSE" in + 0|1) _flags=-VM ;; + 2|3) _flags=-Vm ;; + esac + + ftp -N "${0##/}" -D "$_m" "$_flags" -o- "file:${1}" | + tar -s ",^\+,${FWPKGTMP}/+," \ -s ",^firmware,${DESTDIR}/etc/firmware," \ -C / -zxphf - "+*" "firmware/*" - _pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )" + _pkgname="$( sed -n '/^@name /{s///p;q;}' "${FWPKGTMP}/+CONTENTS" )" if [ ! "$_pkgname" ]; then echo "Failed to extract name from $1, partial install" 2>&1 - rm -rf "$_tmpdir" + rm -rf "$FWPKGTMP" + unset FWPKGTMP return 1 fi # TODO: Should we mark these so real fw_update can -Drepair? - ed -s "${_tmpdir}/+CONTENTS" <&2 usage 2 @@ -283,22 +324,23 @@ if [ "$OPT_D" ]; then INSTALL=false LOCALSRC="${LOCALSRC:-.}" +elif [ "$LOCALSRC" ]; then + DOWNLOAD=false fi -[ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" - -CFILE="$LOCALSRC/$CFILE" - 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 "$DELETE"; then [ "$OPT_D" ] && usage 22 + # Show the "Uninstalling" message when just deleting not upgrading + [ "$VERBOSE" -gt 1 ] && VEROBOSE=3 + set -A installed if [ "${devices[*]:-}" ]; then "$ALL" && usage 22 @@ -325,23 +367,34 @@ deleted='' if [ "${installed:-}" ]; then for fw in "${installed[@]}"; do - delete_firmware "$fw" || continue + if "$DRYRUN"; then + [ "$VERBOSE" -gt 0 ] && echo "Delete $fw" + else + delete_firmware "$fw" || continue + fi deleted="$deleted,$( firmware_devicename "$fw" )" 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 +fi + +CFILE="$LOCALSRC/$CFILE" + if [ "${devices[*]:-}" ]; then "$ALL" && usage 22 else - "$VERBOSE" && echo -n "Detecting firmware ..." - set -A devices -- $( devices_needing_firmware ) - "$VERBOSE" && + [ "$VERBOSE" -gt 1 ] && echo -n "Detect firmware ..." + set -sA devices -- $( detect_firmware ) + [ "$VERBOSE" -gt 1 ] && { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; } fi @@ -379,7 +432,7 @@ if "$INSTALL" && [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do if [ "${f##*/}" = "$i.tgz" ]; then - "$VERBOSE" && echo "$i already installed" + [ "$VERBOSE" -gt 2 ] && echo "Keep $i" kept="$kept,$d" continue 2 fi @@ -388,15 +441,23 @@ if [ -e "$f" ]; then if "$DOWNLOAD"; then - "$VERBOSE" && echo "Verify existing ${f##*/}" - verify "$f" || continue - "$INSTALL" || kept="$kept,$d" + [ "$VERBOSE" -gt 1 ] && ! "$INSTALL" && + echo "Keep/Verify ${f##*/}" + "$DRYRUN" || 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" + if "$DRYRUN"; then + [ "$VERBOSE" -gt 0 ] && echo "Get/Verify ${f##*/}" + else + [ "$VERBOSE" -eq 1 ] && echo -n "Get/Verify ${f##*/} ..." + fetch "$f" && + verify "$f" || + { [ "$VERBOSE" -eq 1 ] && echo " failed."; continue; } + [ "$VERBOSE" -eq 1 ] && ! "$INSTALL" && echo " done." + fi + "$INSTALL" || added="$added,$d" elif "$INSTALL"; then echo "Cannot install ${f##*/}, not found" >&2 continue @@ -404,19 +465,35 @@ "$INSTALL" || continue - removed=false + update='' if [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do - delete_firmware "$i" - removed=true + "$DRYRUN" || delete_firmware "$i" + update="Update" done fi - add_firmware "$f" + "$DRYRUN" || add_firmware "$f" "$update" - if "$removed"; then + f="${f##*/}" + f="${f%.tgz}" + 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 + 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