From eb3aad9e8d14b82f28d9f1554fa48d2c9ab12106 Mon Sep 17 00:00:00 2001 From: Shen Mintao Date: Sat, 25 Jul 2026 19:15:07 +0800 Subject: [PATCH] fix: clarify integrated Bluetooth diagnostics --- diagnose_bt.sh | 6 ++++-- tests/issue63-zlp-quirk/aic-zlp-quirk-test.sh | 16 +++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/diagnose_bt.sh b/diagnose_bt.sh index ef0e200..2448481 100644 --- a/diagnose_bt.sh +++ b/diagnose_bt.sh @@ -85,12 +85,14 @@ legacy_refs_found=false mapfile -t legacy_modprobe_files < <( grep -RIlE '^[[:space:]]*(softdep|alias)[^#]*aic_btusb([[:space:]]|$)' \ /etc/modprobe.d /run/modprobe.d /usr/local/lib/modprobe.d \ - /usr/lib/modprobe.d /lib/modprobe.d 2>/dev/null || true + /usr/lib/modprobe.d /lib/modprobe.d 2>/dev/null | \ + grep -vE '\.aic8800-backup$' || true ) mapfile -t legacy_udev_files < <( grep -RIl 'aic_btusb/new_id' \ /etc/udev/rules.d /run/udev/rules.d \ - /usr/lib/udev/rules.d /lib/udev/rules.d 2>/dev/null || true + /usr/lib/udev/rules.d /lib/udev/rules.d 2>/dev/null | \ + grep -vE '\.aic8800-backup$' || true ) for legacy_file in "${legacy_modprobe_files[@]}"; do diff --git a/tests/issue63-zlp-quirk/aic-zlp-quirk-test.sh b/tests/issue63-zlp-quirk/aic-zlp-quirk-test.sh index 1e69fa4..544062a 100755 --- a/tests/issue63-zlp-quirk/aic-zlp-quirk-test.sh +++ b/tests/issue63-zlp-quirk/aic-zlp-quirk-test.sh @@ -188,7 +188,8 @@ show_status() { local loaded="no" local injections="unavailable" local hook="unavailable" - local dkms_status + local integrated_dkms_status + local standalone_dkms_status if module_loaded "${MODULE_NAME}"; then loaded="yes" @@ -200,9 +201,13 @@ show_status() { fi fi - dkms_status="$(dkms status -m "${PACKAGE_NAME}" -v "${PACKAGE_VERSION}" 2>/dev/null || true)" - if [ -z "${dkms_status}" ]; then - dkms_status="not installed" + standalone_dkms_status="$(dkms status -m "${PACKAGE_NAME}" -v "${PACKAGE_VERSION}" 2>/dev/null || true)" + if [ -z "${standalone_dkms_status}" ]; then + standalone_dkms_status="not installed" + fi + integrated_dkms_status="$(dkms status -m aic8800 -v 1.0.0 2>/dev/null || true)" + if [ -z "${integrated_dkms_status}" ]; then + integrated_dkms_status="not installed" fi printf 'kernel: %s\n' "${KERNEL_RELEASE}" @@ -212,7 +217,8 @@ show_status() { printf 'active hook: %s\n' "${hook}" printf 'ZLP injections:%s\n' " ${injections}" printf 'legacy aic_btusb: %s\n' "$(legacy_btusb_loaded && printf 'loaded' || printf 'not loaded')" - printf 'dkms status: %s\n' "${dkms_status}" + printf 'integrated DKMS: %s\n' "${integrated_dkms_status}" + printf 'standalone DKMS: %s\n' "${standalone_dkms_status}" show_aic_binding }