version 1.132, 2021/12/25 19:08:52 |
version 1.140, 2022/01/06 01:25:12 |
|
|
FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub |
FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub |
|
|
DRYRUN=false |
DRYRUN=false |
VERBOSE=false |
VERBOSE=0 |
DELETE=false |
DELETE=false |
DOWNLOAD=true |
DOWNLOAD=true |
INSTALL=true |
INSTALL=true |
|
|
# 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 -N '${0##/}' -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 -N "${0##/}" -D 'Get/Verify' $flags -o- "$_src" > "$_dst" |
/usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $_flags -o- "$_src" > "$_dst" |
fi |
fi |
) & FTPPID=$! |
) & FTPPID=$! |
set +o monitor |
set +o monitor |
|
|
SECONDS=0 |
SECONDS=0 |
sleep 1 |
sleep 1 |
else |
else |
kill -INT -"$FTPPID" |
kill -INT -"$FTPPID" 2>/dev/null |
_error=" (timed out)" |
_error=" (timed out)" |
fi |
fi |
else |
else |
|
|
|
|
# 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 -v '^[[:space:]]*#' "$FWPATTERNS" | |
grep -v '^[[:space:]]*#' "$FWPATTERNS" | |
while read -r _d _m; do |
while read -r _d _m; do |
|
|
set -sA _devices -- $( |
set -sA _devices -- $( |
firmware_in_dmesg |
firmware_in_dmesg |
for _d in $( installed_firmware '*' '-firmware-' '*' ); do |
for _d in $( installed_firmware '*' '-firmware-' '*' ); do |
echo "$( firmware_devicename "$_d" )" |
firmware_devicename "$_d" |
done |
done |
) |
) |
|
|
[ "${_devices[*]:-}" ] || return 0 |
[ "${_devices[*]:-}" ] || return 0 |
for _d in "${_devices[@]}"; do |
for _d in "${_devices[@]}"; do |
[[ $_last = $_d ]] && continue |
[ "$_last" = "$_d" ] && continue |
echo $_d |
echo "$_d" |
_last="$_d" |
_last="$_d" |
done |
done |
} |
} |
|
|
add_firmware () { |
add_firmware () { |
local _f="${1##*/}" _pkgname |
local _f="${1##*/}" _m="${2:-Install}" _pkgname |
FWPKGTMP="$( 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 -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" | |
0|1) _flags=-VM ;; |
|
2|3) _flags=-Vm ;; |
|
esac |
|
|
|
ftp -N "${0##/}" -D "$_m" "$_flags" -o- "file:${1}" | |
tar -s ",^\+,${FWPKGTMP}/+," \ |
tar -s ",^\+,${FWPKGTMP}/+," \ |
-s ",^firmware,${DESTDIR}/etc/firmware," \ |
-s ",^firmware,${DESTDIR}/etc/firmware," \ |
-C / -zxphf - "+*" "firmware/*" |
-C / -zxphf - "+*" "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() { |
|
|
D) OPT_D=true ;; |
D) OPT_D=true ;; |
n) DRYRUN=true ;; |
n) DRYRUN=true ;; |
p) LOCALSRC="$OPTARG" ;; |
p) LOCALSRC="$OPTARG" ;; |
v) VERBOSE=true ;; |
v) VERBOSE=$(( VERBOSE + 1 )) ;; |
:) |
:) |
echo "${0##*/}: option requires an argument -- -$OPTARG" >&2 |
echo "${0##*/}: option requires an argument -- -$OPTARG" >&2 |
usage 2 |
usage 2 |
|
|
if "$DELETE"; then |
if "$DELETE"; then |
[ "$OPT_D" ] && usage 22 |
[ "$OPT_D" ] && usage 22 |
|
|
|
# Show the "Uninstalling" message when just deleting not upgrading |
|
[ "$VERBOSE" -gt 1 ] && VEROBOSE=3 |
|
|
set -A installed |
set -A installed |
if [ "${devices[*]:-}" ]; then |
if [ "${devices[*]:-}" ]; then |
"$ALL" && usage 22 |
"$ALL" && usage 22 |
|
|
if [ "${installed:-}" ]; then |
if [ "${installed:-}" ]; then |
for fw in "${installed[@]}"; do |
for fw in "${installed[@]}"; do |
if "$DRYRUN"; then |
if "$DRYRUN"; then |
echo "Delete $fw" |
[ "$VERBOSE" -gt 0 ] && echo "Delete $fw" |
else |
else |
delete_firmware "$fw" || continue |
delete_firmware "$fw" || continue |
fi |
fi |
|
|
done |
done |
fi |
fi |
|
|
deleted="${deleted:+${deleted#,}}" |
deleted="${deleted#,}" |
echo "${0:##*/}: deleted ${deleted:-none}"; |
echo "${0:##*/}: deleted ${deleted:-none}"; |
|
|
exit |
exit |
|
|
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 -sA devices -- $( detect_firmware ) |
set -sA devices -- $( detect_firmware ) |
"$VERBOSE" && |
[ "$VERBOSE" -gt 1 ] && |
{ [ "${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 "Keep $i" |
[ "$VERBOSE" -gt 2 ] && 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 |
if "$VERBOSE"; then |
[ "$VERBOSE" -gt 1 ] && ! "$INSTALL" && |
"$INSTALL" && |
echo "Keep/Verify ${f##*/}" |
echo "Verify ${f##*/}" || |
|
echo "Keep/Verify ${f##*/}" |
|
echo "Verify ${f##*/}" |
|
fi |
|
"$DRYRUN" || verify "$f" || continue |
"$DRYRUN" || verify "$f" || continue |
"$INSTALL" || kept="$kept,$d" |
"$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 |
if "$DRYRUN"; then |
if "$DRYRUN"; then |
"$VERBOSE" && echo "Get/Verify ${f##*/}" |
[ "$VERBOSE" -gt 0 ] && echo "Get/Verify ${f##*/}" |
else |
else |
fetch "$f" || continue |
[ "$VERBOSE" -eq 1 ] && echo -n "Get/Verify ${f##*/} ..." |
verify "$f" || continue |
fetch "$f" && |
|
verify "$f" || |
|
{ [ "$VERBOSE" -eq 1 ] && echo " failed."; continue; } |
|
[ "$VERBOSE" -eq 1 ] && ! "$INSTALL" && echo " done." |
fi |
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 |
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 |
"$DRYRUN" || delete_firmware "$i" |
"$DRYRUN" || delete_firmware "$i" |
removed=true |
update="Update" |
done |
done |
fi |
fi |
|
|
"$DRYRUN" || add_firmware "$f" |
"$DRYRUN" || add_firmware "$f" "$update" |
|
|
f="${f##*/}" |
f="${f##*/}" |
f="${f%.tgz}" |
f="${f%.tgz}" |
if "$removed"; then |
if [ "$update" ]; then |
"$DRYRUN" && echo "Update $f" |
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" |
updated="$updated,$d" |
else |
else |
"$DRYRUN" && 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" |
added="$added,$d" |
fi |
fi |
done |
done |