mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

Make fw_update -d behave like the manual says

Browse Source 
The manual says without -a or any drivers specified, fw_update -d
will delete all firmware not required by a driver, and now it does.

While here, slightly improve function name.
This commit is contained in:
afresh1 2024-11-24 21:27:04 +00:00
parent 58b53999c9
commit 78b9b1e61a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/fw_update/fw_update.sh
View File

@ -1,5 +1,5 @@
#!/bin/ksh
# $OpenBSD: fw_update.sh,v 1.61 2024/11/09 02:40:57 afresh1 Exp $
# $OpenBSD: fw_update.sh,v 1.62 2024/11/24 21:27:04 afresh1 Exp $
#
# Copyright (c) 2021,2023 Andrew Hewus Fresh <afresh1@openbsd.org>
#
@ -245,7 +245,7 @@ verify_existing() {
( VERBOSE=$_v verify "$@" )
}
firmware_in_dmesg() {
devices_in_dmesg() {
local IFS
local _d _m _dmesgtail _last='' _nl='
'
@ -360,7 +360,7 @@ detect_firmware() {
local _devices _last='' _d
set -sA _devices -- $(
firmware_in_dmesg
devices_in_dmesg
for _d in $( installed_firmware '*' '-firmware-' '*' ); do
firmware_devicename "$_d"
done
@ -588,6 +588,17 @@ if "$DELETE"; then
)
elif "$ALL"; then
set -A installed -- $( installed_firmware '*' '-firmware-' '*' )
else
set -A installed -- $(
set -- $( devices_in_dmesg )
for f in $( installed_firmware '*' -firmware- '*' ); do
n="$( firmware_devicename "$f" )"
for d; do
[ "$d" = "$n" ] && continue 2
done
echo "$f"
done
)
fi
status " delete "