version 1.123, 2021/12/24 17:57:54 |
version 1.136, 2021/12/25 20:48:40 |
|
|
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 |
|
|
|
DRYRUN=false |
VERBOSE=false |
VERBOSE=false |
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. |
|
|
exec /usr/bin/doas -u "$_user" \ |
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 |
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" |
_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 |
} |
} |
|
|
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 |
|
|
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##*/}" _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 |
"$VERBOSE" && flags=-vm |
ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" | |
ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" | |
tar -s ",^\+,${_tmpdir}/+," \ |
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() { |
|
|
|
|
ALL=false |
ALL=false |
OPT_D= |
OPT_D= |
while getopts :adDp:v name |
while getopts :adDnp:v 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 ;; |
D) OPT_D=true ;; |
|
n) DRYRUN=true ;; |
p) LOCALSRC="$OPTARG" ;; |
p) LOCALSRC="$OPTARG" ;; |
v) VERBOSE=true ;; |
v) VERBOSE=true ;; |
:) |
:) |
|
|
if [ "$OPT_D" ]; then |
if [ "$OPT_D" ]; then |
INSTALL=false |
INSTALL=false |
LOCALSRC="${LOCALSRC:-.}" |
LOCALSRC="${LOCALSRC:-.}" |
|
elif [ "$LOCALSRC" ]; then |
|
DOWNLOAD=false |
fi |
fi |
|
|
[ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" |
|
|
|
CFILE="$LOCALSRC/$CFILE" |
|
|
|
if [ -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 |
echo "need root privileges" >&2 |
exit 1 |
exit 1 |
|
|
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" && echo "Delete $fw" |
|
else |
|
delete_firmware "$fw" || continue |
|
fi |
deleted="$deleted,$( firmware_devicename "$fw" )" |
deleted="$deleted,$( firmware_devicename "$fw" )" |
done |
done |
fi |
fi |
|
|
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" && echo -n "Detecting firmware ..." |
set -sA devices -- $( devices_needing_firmware ) |
set -sA devices -- $( detect_firmware ) |
"$VERBOSE" && |
"$VERBOSE" && |
{ [ "${devices[*]:-}" ] && echo " found." || echo " done." ; } |
{ [ "${devices[*]:-}" ] && echo " found." || echo " done." ; } |
fi |
fi |
|
|
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" && echo "Keep $i" |
kept="$kept,$d" |
kept="$kept,$d" |
continue 2 |
continue 2 |
fi |
fi |
|
|
|
|
if [ -e "$f" ]; then |
if [ -e "$f" ]; then |
if "$DOWNLOAD"; then |
if "$DOWNLOAD"; then |
"$VERBOSE" && echo "Verify existing ${f##*/}" |
"$VERBOSE" && ! "$INSTALL" && |
verify "$f" || continue |
echo "Keep/Verify ${f##*/}" |
"$INSTALL" || kept="$kept,$d" |
"$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" && echo "Get/Verify ${f##*/}" |
|
else |
|
fetch "$f" || continue |
|
verify "$f" || continue |
|
fi |
"$INSTALL" || added="$added,$d" |
"$INSTALL" || added="$added,$d" |
elif "$INSTALL"; then |
elif "$INSTALL"; then |
echo "Cannot install ${f##*/}, not found" >&2 |
echo "Cannot install ${f##*/}, not found" >&2 |
|
|
removed=false |
removed=false |
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 |
removed=true |
done |
done |
fi |
fi |
|
|
add_firmware "$f" |
"$DRYRUN" || add_firmware "$f" |
|
|
|
f="${f##*/}" |
|
f="${f%.tgz}" |
if "$removed"; then |
if "$removed"; then |
|
"$DRYRUN" && "$VERBOSE" && echo "Update $f" |
updated="$updated,$d" |
updated="$updated,$d" |
else |
else |
|
"$DRYRUN" && "$VERBOSE" && echo "Install $f" |
added="$added,$d" |
added="$added,$d" |
fi |
fi |
done |
done |