version 1.113, 2021/12/23 21:34:12 |
version 1.145, 2022/01/07 02:18:52 |
|
|
FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR} |
FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR} |
FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub |
FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub |
|
|
VERBOSE=false |
DRYRUN=false |
|
VERBOSE=0 |
DELETE=false |
DELETE=false |
DOWNLOAD=true |
DOWNLOAD=true |
INSTALL=true |
INSTALL=true |
LOCALSRC= |
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() { |
tmpdir() { |
local _i=1 _dir |
local _i=1 _dir |
|
|
|
|
} |
} |
|
|
fetch() { |
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, |
# If we're not in the installer, |
# we have su(1) and doas(1) is unlikely to be configured. |
# we have su(1) and doas(1) is unlikely to be configured. |
set -o monitor # make sure ftp gets its own process group |
set -o monitor # make sure ftp gets its own process group |
( |
( |
flags=-VM |
_flags=-vm |
"$VERBOSE" && flags=-vm |
case "$VERBOSE" in |
|
0|1) _flags=-VM ;; |
|
2) _flags=-Vm ;; |
|
esac |
if [ -x /usr/bin/su ]; then |
if [ -x /usr/bin/su ]; then |
exec /usr/bin/su -s /bin/ksh "$_user" -c \ |
exec /usr/bin/su -s /bin/ksh "$_user" -c \ |
"/usr/bin/ftp -D 'Get/Verify' $flags -o- '$_src'" > "$_dst" |
"/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $_flags -o- '$_src'" > "$_dst" |
else |
else |
exec /usr/bin/doas -u "$_user" \ |
exec /usr/bin/doas -u "$_user" \ |
/usr/bin/ftp -D 'Get/Verify' $flags -o- "$_src" > "$_dst" |
/usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $_flags -o- "$_src" > "$_dst" |
fi |
fi |
) & _pid=$! |
) & FTPPID=$! |
set +o monitor |
set +o monitor |
|
|
trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM |
|
|
|
SECONDS=0 |
SECONDS=0 |
_last=0 |
_last=0 |
while kill -0 -"$_pid" 2>/dev/null; do |
while kill -0 -"$FTPPID" 2>/dev/null; do |
if [[ $SECONDS -gt 12 ]]; then |
if [[ $SECONDS -gt 12 ]]; then |
set -- $( ls -ln "$_dst" 2>/dev/null ) |
set -- $( ls -ln "$_dst" 2>/dev/null ) |
if [[ $_last -ne $5 ]]; then |
if [[ $_last -ne $5 ]]; then |
|
|
SECONDS=0 |
SECONDS=0 |
sleep 1 |
sleep 1 |
else |
else |
kill -INT -"$_pid" |
kill -INT -"$FTPPID" 2>/dev/null |
_error=" (timed out)" |
_error=" (timed out)" |
fi |
fi |
else |
else |
|
|
done |
done |
|
|
set +o errexit |
set +o errexit |
wait "$_pid" |
wait "$FTPPID" |
_exit=$? |
_exit=$? |
set -o errexit |
set -o errexit |
|
|
trap "" EXIT INT QUIT ABRT TERM |
unset FTPPID |
|
|
if [ "$_exit" -ne 0 ]; then |
if [ "$_exit" -ne 0 ]; then |
rm -f "$_dst" |
rm -f "$_dst" |
|
|
fi |
fi |
} |
} |
|
|
|
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 |
|
} |
|
|
verify() { |
verify() { |
|
[ -e "$CFILE" ] || fetch_cfile |
# On the installer we don't get sha256 -C, so fake it. |
# On the installer we don't get sha256 -C, so fake it. |
if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then |
if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then |
echo "Checksum test for ${1##*/} failed." >&2 |
echo "Checksum test for ${1##*/} failed." >&2 |
|
|
fi |
fi |
} |
} |
|
|
devices_needing_firmware() { |
firmware_in_dmesg() { |
local _d _m _line _dmesgtail _last='' _nl=$( echo ) |
local _d _m _line _dmesgtail _last='' _nl=$( echo ) |
|
|
# When we're not in the installer, the dmesg.boot can |
# When we're not in the installer, the dmesg.boot can |
# contain multiple boots, so only look in the last one |
# contain multiple boots, so only look in the last one |
_dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot | |
_dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )" |
grep -e "^[a-z][a-z]*[0-9]" -e " not configured " )" |
|
|
|
grep -v '^[[:space:]]*#' "$FWPATTERNS" | |
grep -v '^[[:space:]]*#' "$FWPATTERNS" | |
while read -r _d _m; do |
while read -r _d _m; do |
|
|
|
|
firmware_filename() { |
firmware_filename() { |
local _f |
local _f |
|
[ -e "$CFILE" ] || fetch_cfile |
_f="$( sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d' )" |
_f="$( sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d' )" |
! [ "$_f" ] && echo "Unable to find firmware for $1" >&2 && return 1 |
! [ "$_f" ] && echo "Unable to find firmware for $1" >&2 && return 1 |
echo "$_f" |
echo "$_f" |
|
|
|
|
installed_firmware() { |
installed_firmware() { |
local _pre="$1" _match="$2" _post="$3" _firmware |
local _pre="$1" _match="$2" _post="$3" _firmware |
set -A _firmware -- $( |
set -sA _firmware -- $( |
set +o noglob |
set +o noglob |
grep -Fxl '@option firmware' \ |
grep -Fxl '@option firmware' \ |
"${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \ |
"${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \ |
|
|
done |
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 () { |
add_firmware () { |
local _f="${1##*/}" _pkgname |
local _f="${1##*/}" _m="${2:-Install}" _pkgname |
local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )" |
FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )" |
local flags=-VM |
local _flags=-vm |
"$VERBOSE" && flags=-vm |
case "$VERBOSE" in |
ftp -D "Install" "$flags" -o- "file:${1}" | |
0|1) _flags=-VM ;; |
tar -s ",^\+,${_tmpdir}/+," \ |
2|3) _flags=-Vm ;; |
|
esac |
|
|
|
ftp -N "${0##/}" -D "$_m" "$_flags" -o- "file:${1}" | |
|
tar -s ",^\+,${FWPKGTMP}/+," \ |
-s ",^firmware,${DESTDIR}/etc/firmware," \ |
-s ",^firmware,${DESTDIR}/etc/firmware," \ |
-C / -zxphf - "+*" "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 |
if [ ! "$_pkgname" ]; then |
echo "Failed to extract name from $1, partial install" 2>&1 |
echo "Failed to extract name from $1, partial install" 2>&1 |
rm -rf "$_tmpdir" |
rm -rf "$FWPKGTMP" |
|
unset FWPKGTMP |
return 1 |
return 1 |
fi |
fi |
|
|
# TODO: Should we mark these so real fw_update can -Drepair? |
# TODO: Should we mark these so real fw_update can -Drepair? |
ed -s "${_tmpdir}/+CONTENTS" <<EOL |
ed -s "${FWPKGTMP}/+CONTENTS" <<EOL |
/^@comment pkgpath/ -1a |
/^@comment pkgpath/ -1a |
@option manual-installation |
@option manual-installation |
@option firmware |
@option firmware |
|
|
w |
w |
EOL |
EOL |
|
|
chmod 755 "$_tmpdir" |
chmod 755 "$FWPKGTMP" |
mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}" |
mv "$FWPKGTMP" "${DESTDIR}/var/db/pkg/${_pkgname}" |
|
unset FWPKGTMP |
} |
} |
|
|
delete_firmware() { |
delete_firmware() { |
local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg" |
local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg" |
|
|
# TODO: Check hash for files before deleting |
# TODO: Check hash for files before deleting |
"$VERBOSE" && echo "Uninstalling $_pkg" |
[ "$VERBOSE" -gt 2 ] && echo -n "Uninstall $_pkg ..." |
_cwd="${_pkgdir}/$_pkg" |
_cwd="${_pkgdir}/$_pkg" |
|
|
if [ ! -e "$_cwd/+CONTENTS" ] || |
if [ ! -e "$_cwd/+CONTENTS" ] || |
|
|
rm -f "$_r" |
rm -f "$_r" |
fi |
fi |
done |
done |
|
|
|
[ "$VERBOSE" -gt 2 ] && echo " done." |
|
|
|
return 0 |
} |
} |
|
|
usage() { |
usage() { |
echo "usage: ${0##*/} [-d | -D | -L] [-av] [driver | file ...]" |
echo "usage: ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]" |
exit 2 |
exit 2 |
} |
} |
|
|
ALL=false |
ALL=false |
OPT_D= |
OPT_F= |
OPT_L= |
while getopts :adFnp:v name |
while getopts :adDLv name |
|
do |
do |
case "$name" in |
case "$name" in |
a) ALL=true ;; |
a) ALL=true ;; |
d) DELETE=true ;; |
d) DELETE=true ;; |
D) OPT_D=true ;; |
F) OPT_F=true ;; |
L) OPT_L=true ;; |
n) DRYRUN=true ;; |
v) VERBOSE=true ;; |
p) LOCALSRC="$OPTARG" ;; |
?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;; |
v) VERBOSE=$(( VERBOSE + 1 )) ;; |
esac |
:) |
|
echo "${0##*/}: option requires an argument -- -$OPTARG" >&2 |
|
usage 2 |
|
;; |
|
?) |
|
echo "${0##*/}: unknown option -- -$OPTARG" >&2 |
|
usage 2 |
|
;; |
|
esac |
done |
done |
shift $((OPTIND - 1)) |
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 |
|
|
if [ "$OPT_D" ]; then |
# "Download only" means local dir and don't install |
# "Download only" means local dir and don't install |
if [ "$OPT_F" ]; then |
INSTALL=false |
INSTALL=false |
LOCALSRC=. |
LOCALSRC="${LOCALSRC:-.}" |
elif [ "$OPT_L" ]; then |
|
# "Local" means don't download, install from local dir |
# 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 |
DOWNLOAD=false |
LOCALSRC=. |
|
else |
|
LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" |
|
fi |
fi |
|
|
CFILE="$LOCALSRC/$CFILE" |
if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then |
|
echo "need root privileges" >&2 |
if "$INSTALL" || "$DELETE"; then |
exit 1 |
if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then |
|
echo "need root privileges" >&2 |
|
exit 1 |
|
fi |
|
fi |
fi |
|
|
set -A devices -- "$@" |
set -sA devices -- "$@" |
|
|
if "$DELETE"; then |
if "$DELETE"; then |
[ "$OPT_D" ] || [ "$OPT_L" ] && usage 22 |
[ "$OPT_F" ] && usage 22 |
|
|
|
# Show the "Uninstalling" message when just deleting not upgrading |
|
[ "$VERBOSE" -gt 0 ] && VERBOSE=3 |
|
|
set -A installed |
set -A installed |
if [ "${devices[*]:-}" ]; then |
if [ "${devices[*]:-}" ]; then |
"$ALL" && usage 22 |
"$ALL" && usage 22 |
|
|
deleted='' |
deleted='' |
if [ "${installed:-}" ]; then |
if [ "${installed:-}" ]; then |
for fw in "${installed[@]}"; do |
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" )" |
deleted="$deleted,$( firmware_devicename "$fw" )" |
done |
done |
fi |
fi |
|
|
deleted="${deleted:+${deleted#,}}" |
deleted="${deleted#,}" |
echo "${0:##*/}: deleted ${deleted:-none}"; |
echo "${0:##*/}: deleted ${deleted:-none}"; |
|
|
exit |
exit |
fi |
fi |
|
|
|
if [ ! "$LOCALSRC" ]; then |
|
LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" |
|
REMOVE_LOCALSRC=true |
|
fi |
|
|
|
CFILE="$LOCALSRC/$CFILE" |
|
|
if [ "${devices[*]:-}" ]; then |
if [ "${devices[*]:-}" ]; then |
"$ALL" && usage 22 |
"$ALL" && usage 22 |
else |
else |
"$VERBOSE" && echo -n "Detecting firmware ..." |
[ "$VERBOSE" -gt 1 ] && echo -n "Detect firmware ..." |
set -A devices -- $( devices_needing_firmware ) |
set -sA devices -- $( detect_firmware ) |
"$VERBOSE" && |
[ "$VERBOSE" -gt 1 ] && |
{ [ "${devices[*]:-}" ] && echo " found." || echo " done." ; } |
{ [ "${devices[*]:-}" ] && echo " found." || echo " done." ; } |
fi |
fi |
|
|
[ "${devices[*]:-}" ] || exit |
[ "${devices[*]:-}" ] || exit |
|
|
if "$DOWNLOAD"; then |
|
fetch "$CFILE" |
|
! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" && |
|
echo "Signature check of SHA256.sig failed" >&2 && exit 1 |
|
fi |
|
|
|
added='' |
added='' |
updated='' |
updated='' |
|
kept='' |
for f in "${devices[@]}"; do |
for f in "${devices[@]}"; do |
d="$( firmware_devicename "$f" )" |
d="$( firmware_devicename "$f" )" |
|
|
|
|
if "$INSTALL" && [ "${installed[*]:-}" ]; then |
if "$INSTALL" && [ "${installed[*]:-}" ]; then |
for i in "${installed[@]}"; do |
for i in "${installed[@]}"; do |
if [ "${f##*/}" = "$i.tgz" ]; then |
if [ "${f##*/}" = "$i.tgz" ]; then |
"$VERBOSE" && echo "$i already installed" |
[ "$VERBOSE" -gt 2 ] && echo "Keep $i" |
|
kept="$kept,$d" |
continue 2 |
continue 2 |
fi |
fi |
done |
done |
|
|
|
|
if [ -e "$f" ]; then |
if [ -e "$f" ]; then |
if "$DOWNLOAD"; then |
if "$DOWNLOAD"; then |
"$VERBOSE" && echo "Verify existing ${f##*/}" |
[ "$VERBOSE" -gt 1 ] && ! "$INSTALL" && |
verify "$f" || continue |
echo "Keep/Verify ${f##*/}" |
|
"$DRYRUN" || verify "$f" || continue |
|
"$INSTALL" || kept="$kept,$d" |
# else assume it was verified when downloaded |
# else assume it was verified when downloaded |
fi |
fi |
elif "$DOWNLOAD"; then |
elif "$DOWNLOAD"; then |
fetch "$f" || continue |
if "$DRYRUN"; then |
verify "$f" || continue |
[ "$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 |
elif "$INSTALL"; then |
echo "Cannot install ${f##*/}, not found" >&2 |
echo "Cannot install ${f##*/}, not found" >&2 |
continue |
continue |
|
|
|
|
"$INSTALL" || continue |
"$INSTALL" || continue |
|
|
removed=false |
update='' |
if [ "${installed[*]:-}" ]; then |
if [ "${installed[*]:-}" ]; then |
for i in "${installed[@]}"; do |
for i in "${installed[@]}"; do |
delete_firmware "$i" |
"$DRYRUN" || delete_firmware "$i" |
removed=true |
update="Update" |
done |
done |
fi |
fi |
|
|
add_firmware "$f" |
"$DRYRUN" || add_firmware "$f" "$update" |
|
|
if "$removed"; then |
f="${f##*/}" |
[ "$updated" ] && updated="$updated," |
f="${f%.tgz}" |
updated="$updated$d" |
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 |
else |
[ "$added" ] && added="$added," |
if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then |
added="$added$d" |
echo " installed." |
|
elif [ "$VERBOSE" -eq 1 ]; then |
|
echo "Install $f" |
|
elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then |
|
echo "Install $f" |
|
fi |
|
added="$added,$d" |
fi |
fi |
done |
done |
|
|
if ! $VERBOSE && { [ "$added" ] || [ "$updated" ]; }; then |
added="${added:#,}" |
echo "${0##*/}: $( |
updated="${updated:#,}" |
[ "$added" ] && echo -n "added ${added}" |
kept="${kept:#,}" |
[ "$added" ] && [ "$updated" ] && echo -n "; " |
if "$INSTALL"; then |
[ "$updated" ] && echo -n "updated ${updated}" |
echo "${0##*/}: added ${added:-none}; updated ${updated:-none}; kept ${kept:-none}" |
)" |
else |
|
echo "${0##*/}: downloaded ${added:-none}; kept ${kept:-none}" |
fi |
fi |