* [make-initrd] [PATCH v1 1/9] mk: Introduce guess-requires primitive for feature-triggered guess modules
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 2/9] guess: Unify internal state with structured guess.tsv logging Alexey Gladkov
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
Features like sshfsroot historically required specific guess modules
to run when activated (e.g. net with GUESS_NET_IFACE=all, smart-card).
Previously this was implemented via ad-hoc Make rules in individual guess
module config.mk files checking recently activated features.
Introduce $(call guess-requires, ...) in functions.mk.in to allow features
to declaratively declare guess modules they require. This populates
both FEATURE-REQUIRES-GUESS-* (for dependency reporting) and
FEATURE_REQUIRES_GUESS (exported to guess-runner via .EXPORT_ALL_VARIABLES).
This replaces module-level conditionals and prepares for single-pass guess
execution.
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
features/sshfsroot/config.mk | 1 +
guess/net/config.mk | 5 -----
guess/smart-card/config.mk | 3 ---
mk/functions.mk.in | 15 +++++++++++++++
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/features/sshfsroot/config.mk b/features/sshfsroot/config.mk
index baf8fa5e..fdf66c6a 100644
--- a/features/sshfsroot/config.mk
+++ b/features/sshfsroot/config.mk
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
$(call feature-requires,add-modules depmod-image network)
+$(call guess-requires,net:GUESS_NET_IFACE=all smart-card)
SSHFS_DATADIR = $(FEATURESDIR)/sshfsroot/data
SSHFS_PRELOAD = af_packet fs-fuse
diff --git a/guess/net/config.mk b/guess/net/config.mk
index 79230215..572b9d76 100644
--- a/guess/net/config.mk
+++ b/guess/net/config.mk
@@ -1,8 +1,3 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-ifeq ($(call if-recently-activated-feature,sshfsroot)/$(GUESS_NET_IFACE),sshfsroot/)
-GUESS_NET_IFACE = all
-GUESS_MODULES += net
-endif
-
GUESS_NET_IFACE ?=
diff --git a/guess/smart-card/config.mk b/guess/smart-card/config.mk
index 25dccd92..31d49ed8 100644
--- a/guess/smart-card/config.mk
+++ b/guess/smart-card/config.mk
@@ -1,4 +1 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-ifeq ($(call if-recently-activated-feature,sshfsroot),sshfsroot)
-GUESS_MODULES += smart-card
-endif
diff --git a/mk/functions.mk.in b/mk/functions.mk.in
index cefde43d..b11871f0 100644
--- a/mk/functions.mk.in
+++ b/mk/functions.mk.in
@@ -51,6 +51,20 @@ $(strip $(if $(filter feature-requires,$(0)),$(if $(1),\
$(call __feature-requires,$(strip $(call current-feature-name)),$(1))))))
endef
+define __guess-requires
+$(strip $(if $(filter __guess-requires,$(0)),$(if $(1),$(if $(2),\
+ $(eval FEATURE-REQUIRES-GUESS-$(1) += $(2))\
+ $(foreach m,$(2),$(eval FEATURE_REQUIRES_GUESS += $(1):$(m)))))))
+endef
+
+# $(call guess-requires,<guess-module> ...)
+# Set a list of guess modules required by the current feature.
+define guess-requires
+$(strip $(if $(filter guess-requires,$(0)),$(if $(1),\
+ $(if $(filter %/config.mk,$(lastword $(MAKEFILE_LIST))),\
+ $(call __guess-requires,$(strip $(call current-feature-name)),$(1))))))
+endef
+
# This is helper to filter a disabled files.
# $(call wildcard-features,<filename>)
# Return a space-separated list of full <filename> paths for each feature.
@@ -69,6 +83,7 @@ $(strip $(if $(filter show-feature-dependency,$(0)),$(if $(1),\
$(info $(space) requires : $(sort $(FEATURE-REQUIRES-$(n)))) \
$(info $(space) disables : $(sort $(FEATURE-DISABLES-$(n)))) \
$(info $(space) required : $(sort $(FEATURE-REQUIRED-$(n)))) \
+ $(if $(FEATURE-REQUIRES-GUESS-$(n)),$(info $(space) guess-requires : $(sort $(FEATURE-REQUIRES-GUESS-$(n))))) \
$(info $(null))))))
endef
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 2/9] guess: Unify internal state with structured guess.tsv logging
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 1/9] mk: Introduce guess-requires primitive for feature-triggered guess modules Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 3/9] guess: Replace recursive Make loop with bash guess-runner Alexey Gladkov
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
Previously, guess modules communicated by creating multiple ad-hoc
files with colon-separated names under $GUESSDIR (e.g. guess:features:*,
guess:modules:*, guess:variables:*). This scattered internal state,
made provenance tracking difficult, and caused filesystem overhead.
Consolidate this state into a structured $GUESSDIR/guess.tsv file
recording the record kind, name, value, source module, and context.
Update guess helper functions to log to guess.tsv while maintaining
compatibility with existing unit test dump helpers and action scripts.
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
guess/keyboard/action | 2 +-
testing/tests/guess-feature-sh-functions | 53 ++++++++++++++++++++++++
tools/guess-functions | 33 ++++++++++++---
3 files changed, 81 insertions(+), 7 deletions(-)
diff --git a/guess/keyboard/action b/guess/keyboard/action
index 807c6bbe..0cac13d6 100755
--- a/guess/keyboard/action
+++ b/guess/keyboard/action
@@ -60,7 +60,7 @@ detect()
detect
-if [ ! -s "$GUESSDIR/guess:modalias${GUESS_SUFFIX:+:$GUESS_SUFFIX}" ]; then
+if [ ! -s "$GUESSDIR/guess:modalias${GUESS_SUFFIX:+:$GUESS_SUFFIX}" ] && ! has_guessed_modalias; then
[ -n "${KEYBOARD_DEFAULT_MODULES-}" ] ||
exit 0
printf '%s\n' ${KEYBOARD_DEFAULT_MODULES-} |
diff --git a/testing/tests/guess-feature-sh-functions b/testing/tests/guess-feature-sh-functions
index da1bdd2c..14ee4495 100755
--- a/testing/tests/guess-feature-sh-functions
+++ b/testing/tests/guess-feature-sh-functions
@@ -27,6 +27,59 @@ guess_feature_test_init() {
guess_feature_test_dump() {
local file first=1
+ if [ -f "$GUESSDIR/guess.tsv" ]; then
+ declare -A dump_files
+ local kind name val src ctx fn item suffix
+ while IFS=$'\t' read -r kind name val src ctx; do
+ case "$kind" in
+ feature)
+ [ "$val" != "-" ] || val=""
+ fn="guess:features${val:+:$val}"
+ item="$name"
+ ;;
+ variable)
+ fn="guess:variables:$name"
+ item="$val"
+ ;;
+ module)
+ suffix=
+ [ -z "${GUESS_SUFFIX-}" ] || suffix=":$GUESS_SUFFIX"
+ fn="guess:modules${suffix}"
+ item="$val"
+ ;;
+ modalias)
+ suffix=
+ [ -z "${GUESS_SUFFIX-}" ] || suffix=":$GUESS_SUFFIX"
+ fn="guess:modalias${suffix}"
+ item="$val"
+ ;;
+ opt-module)
+ suffix=
+ [ -z "${GUESS_SUFFIX-}" ] || suffix=":$GUESS_SUFFIX"
+ fn="guess:opt-modules${suffix}"
+ item="$val"
+ ;;
+ opt-modalias)
+ suffix=
+ [ -z "${GUESS_SUFFIX-}" ] || suffix=":$GUESS_SUFFIX"
+ fn="guess:opt-modalias${suffix}"
+ item="$val"
+ ;;
+ *) continue ;;
+ esac
+ dump_files["$fn"]="${dump_files["$fn"]-}"$'\n'"$item"
+ done < "$GUESSDIR/guess.tsv"
+
+ readarray -t sorted_files < <(for f in "${!dump_files[@]}"; do echo "$f"; done | sort)
+ for fn in "${sorted_files[@]}"; do
+ [ "$first" -eq 1 ] || printf '\n'
+ first=0
+ printf '%s\n' "$fn"
+ printf '%s\n' "${dump_files[$fn]}" | sed '/^$/d'
+ done
+ return 0
+ fi
+
find "$GUESSDIR" -maxdepth 1 -type f -name 'guess:*' | sort |
while read -r file; do
[ "$first" -eq 1 ] ||
diff --git a/tools/guess-functions b/tools/guess-functions
index 46d29f78..eb63d7e1 100644
--- a/tools/guess-functions
+++ b/tools/guess-functions
@@ -24,12 +24,27 @@ get_device() {
return 1
}
+log_guess() {
+ local kind="$1" name="$2" val="${3:--}"
+ local suffix="${GUESS_SUFFIX-}"
+ local source="${GUESS_MODULE_NAME:-${suffix##*:}}"
+ source="${source:--}"
+ local context="${GUESS_CONTEXT:--}"
+ printf '%s\t%s\t%s\t%s\t%s\n' "$kind" "$name" "$val" "$source" "$context" >> "$GUESSDIR/guess.tsv"
+}
+
+has_guessed_modalias() {
+ [ -f "$GUESSDIR/guess.tsv" ] && grep -qs -E '^(modalias|opt-modalias)\b' "$GUESSDIR/guess.tsv"
+}
+
guess_modalias() {
$TRACE_ENTER "$@" || {
$TRACE_ENTER_RETCODE $?
return $?
}
- printf '%s\n' "$1" >> "$GUESSDIR/guess:modalias${GUESS_SUFFIX:+:$GUESS_SUFFIX}"
+ local suffix="${GUESS_SUFFIX-}"
+ local group="${suffix%%:*}"
+ log_guess "modalias" "${group:-add}" "$1"
}
guess_module() {
@@ -37,7 +52,9 @@ guess_module() {
$TRACE_ENTER_RETCODE $?
return $?
}
- printf '%s\n' "$1" >> "$GUESSDIR/guess:modules${GUESS_SUFFIX:+:$GUESS_SUFFIX}"
+ local suffix="${GUESS_SUFFIX-}"
+ local group="${suffix%%:*}"
+ log_guess "module" "${group:-add}" "$1"
}
guess_optional_modalias() {
@@ -45,7 +62,9 @@ guess_optional_modalias() {
$TRACE_ENTER_RETCODE $?
return $?
}
- printf '%s\n' "$1" >> "$GUESSDIR/guess:opt-modalias${GUESS_SUFFIX:+:$GUESS_SUFFIX}"
+ local suffix="${GUESS_SUFFIX-}"
+ local group="${suffix%%:*}"
+ log_guess "opt-modalias" "${group:-add}" "$1"
}
guess_optional_module() {
@@ -53,7 +72,9 @@ guess_optional_module() {
$TRACE_ENTER_RETCODE $?
return $?
}
- printf '%s\n' "$1" >> "$GUESSDIR/guess:opt-modules${GUESS_SUFFIX:+:$GUESS_SUFFIX}"
+ local suffix="${GUESS_SUFFIX-}"
+ local group="${suffix%%:*}"
+ log_guess "opt-module" "${group:-add}" "$1"
}
guess_feature() {
@@ -61,7 +82,7 @@ guess_feature() {
$TRACE_ENTER_RETCODE $?
return $?
}
- printf '%s\n' "$1" >> "$GUESSDIR/guess:features${GUESS_SUFFIX:+:$GUESS_SUFFIX}"
+ log_guess "feature" "$1" "${GUESS_SUFFIX-}"
}
guess_variable() {
@@ -76,7 +97,7 @@ guess_variable() {
local var="$1"
shift
- printf '%s\n' "$@" >> "$GUESSDIR/guess:variables:$var"
+ log_guess "variable" "$var" "$*"
}
guess_fstype() {
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 3/9] guess: Replace recursive Make loop with bash guess-runner
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 1/9] mk: Introduce guess-requires primitive for feature-triggered guess modules Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 2/9] guess: Unify internal state with structured guess.tsv logging Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 4/9] guess: Add guess-explain tool and CLI subcommand for config provenance Alexey Gladkov
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
When guess modules dynamically activate features that in turn require
other guess modules, the build system previously re-executed $(MAKE)
recursively with updated PASSED_GUESS_MODULES. This was slow, made
parameter passing awkward, and made dependency tracking fragile.
Introduce tools/guess-runner written in pure Bash 4+. It runs guess
module action scripts iteratively until convergence using dependency
triggers (via FEATURE_REQUIRES_GUESS or --triggers) while respecting
module config.mk files and DISABLE_GUESS.
Update tools/guess-config to read from structured guess.tsv directly,
removing legacy colon-separated file parsing, and update test fixtures in
ts0060-guess-config and ts0062-guess-config-tsv.
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
mk/guess.mk.in | 43 ++--
testing/tests/ts0060-guess-config/run | 14 +-
testing/tests/ts0062-guess-config-tsv/run | 14 +-
testing/tests/ts0066-guess-runner/expect | 5 +
testing/tests/ts0066-guess-runner/run | 43 ++++
tools/guess-config | 284 ++++++++++------------
tools/guess-runner | 189 ++++++++++++++
7 files changed, 391 insertions(+), 201 deletions(-)
create mode 100644 testing/tests/ts0066-guess-runner/expect
create mode 100755 testing/tests/ts0066-guess-runner/run
create mode 100755 tools/guess-runner
diff --git a/mk/guess.mk.in b/mk/guess.mk.in
index 5eecf0ce..2446f3bb 100644
--- a/mk/guess.mk.in
+++ b/mk/guess.mk.in
@@ -8,9 +8,6 @@ endif
-include $(GUESSDIR)/guessed.mk
-RECENTLY_ACTIVATED_FEATURES := \
- $(filter-out $(ALL_ACTIVE_FEATURES),$(call get-all-active-features))
-
GUESS_CONFIG_MODULES = \
$(foreach mod1, \
$(if $(findstring all,$(AUTODETECT)), \
@@ -19,24 +16,16 @@ GUESS_CONFIG_MODULES = \
$(wildcard $(mod1)/config.mk))
GUESS_MODULES = \
- $(sort $(filter-out $(sort $(PASSED_GUESS_MODULES)), \
+ $(sort $(filter-out $(sort $(DISABLE_GUESS)), \
$(if $(findstring all,$(AUTODETECT)), \
$(notdir $(call filter-dirs,$(wildcard $(DETECTDIR)/*))), \
$(AUTODETECT))))
-include $(GUESS_CONFIG_MODULES)
-ifdef VERBOSE
-$(info GUESS_MODULES = $(notdir $(GUESS_MODULES)))
-$(info PASSED_GUESS_MODULES = $(notdir $(PASSED_GUESS_MODULES)))
-endif
-
-PHONY += guess
-
-ifneq ($(GUESS_MODULES),)
-
GUESS_DEVICE_SCRIPTS = $(call wildcard-features,guess/device)
GUESS_FSTYPE_SCRIPTS = $(call wildcard-features,guess/fstype)
+GUESS_COMMON_SCRIPTS = $(call wildcard-features,guess/common)
ALL_ACTIVE_FEATURES := $(call get-all-active-features)
PHONY += prepare-guess
@@ -44,25 +33,12 @@ PHONY += prepare-guess
prepare-guess: check-for-root
@mkdir $(verbose3) -m 755 -p -- $(GUESSDIR)
-include \
- $(sort $(filter-out \
- $(foreach exl,$(DISABLE_GUESS),$(realpath $(exl:%=$(DETECTDIR)/%/rules.mk))), \
- $(foreach mod,$(GUESS_MODULES),$(realpath $(DETECTDIR)/$(mod)/rules.mk))))
-
PHONY += test-guess-actions
test-guess-actions: prepare-guess
@[ -n "$(TEST_GUESS_ACTIONS)" ] || { printf "TEST_GUESS_ACTIONS not specified\n" >&2; exit 1; }
@for exe in $(TEST_GUESS_ACTIONS); do echo "RUN: $$exe"; "$$exe"; done
-guess: prepare-guess
- @$(VMSG) "Collection of guessed parameters ..."
- @$(TOOLSDIR)/guess-config > $(GUESSDIR)/guessed.mk
- @$(VMSG) "Guessing config ..."
- @$(MAKE) $(MFLAGS) -f @projectdir@/mk/main.mk guess PASSED_GUESS_MODULES+="$(GUESS_MODULES)"
-
-else # !GUESS_MODULES
-
unknown_features = \
$(filter-out \
$(notdir $(wildcard $(FEATURESDIR)/*)), \
@@ -81,7 +57,16 @@ ifeq ($(IGNORE_DEPMOD),)
@depmod -a $(if $(KERNEL_SYSTEM_MAP),-F "$(KERNEL_SYSTEM_MAP)") "$(KERNEL)"
endif
-guess: depmod-host
- @$(VMSG) "Guessing is complete"
+PHONY += guess guess-run
+
+guess-run: prepare-guess
+ @$(VMSG) "Guessing config ..."
+ @$(TOOLSDIR)/guess-runner \
+ $(if $(VERBOSE),-v) \
+ --modules="$(notdir $(GUESS_MODULES))" \
+ --disabled="$(DISABLE_GUESS)"
+ @$(VMSG) "Collection of guessed parameters ..."
+ @$(TOOLSDIR)/guess-config > $(GUESSDIR)/guessed.mk
-endif # GUESS_MODULES
+guess: guess-run depmod-host
+ @$(VMSG) "Guessing is complete"
diff --git a/testing/tests/ts0060-guess-config/run b/testing/tests/ts0060-guess-config/run
index 5962c370..357cebd5 100755
--- a/testing/tests/ts0060-guess-config/run
+++ b/testing/tests/ts0060-guess-config/run
@@ -16,11 +16,13 @@ export RESOLVE_MODALIAS=1
export KERNEL=6.6.1
export PATH="$tmpdir/bin:$PWD/.build/dest/usr/bin:$PWD/.build/dest/usr/sbin:$PWD/tools:$PATH"
-echo "val1 val2" > "$GUESSDIR/guess:variables:TEST_VAR"
-echo "ext4" > "$GUESSDIR/guess:modules:add:storage"
-echo "pci:v00008086d000010D3sv*sd*bc*sc*i*" > "$GUESSDIR/guess:modalias:add:nic"
-echo "usb:v1234p5678" > "$GUESSDIR/guess:modalias:rescue:hid"
-echo "virtio_balloon" > "$GUESSDIR/guess:opt-modules:add:mem"
-echo "network" > "$GUESSDIR/guess:features:net"
+cat > "$GUESSDIR/guess.tsv" <<'EOF'
+variable TEST_VAR val1 val2 - -
+module add ext4 storage -
+modalias add pci:v00008086d000010D3sv*sd*bc*sc*i* nic -
+modalias rescue usb:v1234p5678 hid -
+opt-module add virtio_balloon mem -
+feature network net - -
+EOF
tools/guess-config
diff --git a/testing/tests/ts0062-guess-config-tsv/run b/testing/tests/ts0062-guess-config-tsv/run
index 1947f4f1..0587906c 100755
--- a/testing/tests/ts0062-guess-config-tsv/run
+++ b/testing/tests/ts0062-guess-config-tsv/run
@@ -16,11 +16,13 @@ export RESOLVE_MODALIAS=1
export KERNEL=6.6.1
export PATH="$tmpdir/bin:$PWD/.build/dest/usr/bin:$PWD/.build/dest/usr/sbin:$PWD/tools:$PATH"
-echo "val1 val2" > "$GUESSDIR/guess:variables:TEST_VAR"
-echo "ext4" > "$GUESSDIR/guess:modules:add:storage"
-echo "pci:v00008086d000010D3sv*sd*bc*sc*i*" > "$GUESSDIR/guess:modalias:add:nic"
-echo "usb:v1234p5678" > "$GUESSDIR/guess:modalias:rescue:hid"
-echo "virtio_balloon" > "$GUESSDIR/guess:opt-modules:add:mem"
-echo "network" > "$GUESSDIR/guess:features:net"
+cat > "$GUESSDIR/guess.tsv" <<'EOF'
+variable TEST_VAR val1 val2 - -
+module add ext4 storage -
+modalias add pci:v00008086d000010D3sv*sd*bc*sc*i* nic -
+modalias rescue usb:v1234p5678 hid -
+opt-module add virtio_balloon mem -
+feature network net - -
+EOF
tools/guess-config --tsv
diff --git a/testing/tests/ts0066-guess-runner/expect b/testing/tests/ts0066-guess-runner/expect
new file mode 100644
index 00000000..55ff2ad9
--- /dev/null
+++ b/testing/tests/ts0066-guess-runner/expect
@@ -0,0 +1,5 @@
+feature featA add:guess-modA guess-modA -
+feature featB add:guess-modB guess-modB -
+feature featA add:guess-modA guess-modA -
+feature featB add:guess-modB guess-modB -
+rc=0
diff --git a/testing/tests/ts0066-guess-runner/run b/testing/tests/ts0066-guess-runner/run
new file mode 100755
index 00000000..5b4e7cde
--- /dev/null
+++ b/testing/tests/ts0066-guess-runner/run
@@ -0,0 +1,43 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+gdir="$tmpdir/guess"
+modules_dir="$tmpdir/modules"
+mkdir -p "$modules_dir/modA" "$modules_dir/modB"
+
+cat > "$modules_dir/modA/action" <<'EOF'
+#!/bin/bash -efu
+. guess-functions
+guess_feature featA
+EOF
+chmod +x "$modules_dir/modA/action"
+
+cat > "$modules_dir/modB/action" <<'EOF'
+#!/bin/bash -efu
+. guess-functions
+guess_feature featB
+EOF
+chmod +x "$modules_dir/modB/action"
+
+export PATH="$PWD/.build/dest/usr/bin:$PWD/.build/dest/usr/sbin:$PWD/tools:$PATH"
+# Test 1: CLI --triggers option
+tools/guess-runner \
+ --guessdir="$gdir" \
+ --detectdir="$modules_dir" \
+ --triggers="featA:modB" \
+ --modules="modA"
+
+cat "$gdir/guess.tsv"
+
+# Test 2: Triggering via FEATURE_REQUIRES_GUESS environment variable
+rm -f "$gdir/guess.tsv"
+export FEATURE_REQUIRES_GUESS="featA:modB"
+tools/guess-runner \
+ --guessdir="$gdir" \
+ --detectdir="$modules_dir" \
+ --modules="modA"
+
+cat "$gdir/guess.tsv"
diff --git a/tools/guess-config b/tools/guess-config
index f9dba6a7..3a356ae7 100755
--- a/tools/guess-config
+++ b/tools/guess-config
@@ -5,6 +5,18 @@
$TRACE_SOURCE "Processing ..."
+GUESS_CONFIG_FORMAT="${GUESS_CONFIG_FORMAT:-make}"
+while [ "$#" -gt 0 ]; do
+ case "$1" in
+ --format=*) GUESS_CONFIG_FORMAT="${1#--format=}" ;;
+ --format) shift; GUESS_CONFIG_FORMAT="${1-}" ;;
+ --tsv) GUESS_CONFIG_FORMAT="tsv" ;;
+ --make) GUESS_CONFIG_FORMAT="make" ;;
+ *) break ;;
+ esac
+ shift
+done
+
modules_fmt() {
while read -r m; do
m="${m##*/}"
@@ -14,185 +26,137 @@ modules_fmt() {
fmt -u -w60
}
-file_is_not_empty() {
- local m
- while [ "$#" -gt 0 ]; do
- [ ! -s "$1" ] || return 0
- shift
- done
- return 1
-}
-
print_vars() {
- file_is_not_empty "$GUESSDIR/guess:variables":* ||
- return 0
-
- for m in "$GUESSDIR/guess:variables":*; do
- [ -s "$m" ] ||
- continue
- n="${m##*:}"
- printf '%s = \\\n' "$n"
- sort -u "$m" |
- tr '\n' ' ' |
- fmt |
- sed -e 's/^/\t/; $ ! s/$/ \\/'
- done
-
- printf '\n'
-}
-
-print_vars_tsv() {
- file_is_not_empty "$GUESSDIR/guess:variables":* ||
- return 0
-
- for m in "$GUESSDIR/guess:variables":*; do
- [ -s "$m" ] ||
- continue
- n="${m##*:}"
- while read -r val; do
- [ -n "$val" ] || continue
- printf 'variable\t%s\t%s\n' "$n" "$val"
- done < <(sort -u "$m")
+ [ -f "$GUESSDIR/guess.tsv" ] || return 0
+
+ declare -A var_values=()
+ while IFS=$'\t' read -r kind name val rest; do
+ [ "$kind" = "variable" ] || continue
+ [ -n "$name" ] || continue
+ [ "$val" != "-" ] || val=""
+ var_values["$name"]="${var_values["$name"]-}$val"$'\n'
+ done < "$GUESSDIR/guess.tsv"
+
+ [ "${#var_values[@]}" -gt 0 ] || return 0
+
+ readarray -t sorted_vars < <(for v in "${!var_values[@]}"; do echo "$v"; done | sort)
+ for v in "${sorted_vars[@]}"; do
+ if [ "$GUESS_CONFIG_FORMAT" = "tsv" ]; then
+ while read -r val; do
+ [ -n "$val" ] || continue
+ printf 'variable\t%s\t%s\n' "$v" "$val"
+ done < <(printf '%s' "${var_values[$v]}" | sort -u)
+ else
+ printf '%s = \\\n' "$v"
+ printf '%s' "${var_values[$v]}" | sort -u | tr '\n' ' ' | fmt | sed -e 's/^/\t/; $ ! s/$/ \\/'
+ fi
done
+ [ "$GUESS_CONFIG_FORMAT" = "tsv" ] || printf '\n'
}
print_list() {
- file_is_not_empty "$GUESSDIR/guess:$2":* "$GUESSDIR/guess:$2" ||
- return 0
-
- printf '%s += \\\n' "$1"
-
- for m in "$GUESSDIR/guess:$2":* "$GUESSDIR/guess:$2"; do
- [ -s "$m" ] ||
- continue
-
- fn="${m##*/guess:}"
- name="${fn##*:}"
- type="${fn%%:*}"
-
- [ "$type" = 'features' ] ||
- guess_feature add-modules
-
- if [ -n "${verbose1-}" ]; then
- {
- printf 'Module "%s" propose %s:\n' "$name" "$type"
- sort -u "$m" | modules_fmt
- printf '\n'
- } >&2
- fi
-
- cat "$m"
- done |
- sort -u |
- modules_fmt |
- sed -e 's/^/\t/; $ ! s/$/ \\/'
- printf '\n'
-}
-
-print_list_tsv() {
- file_is_not_empty "$GUESSDIR/guess:$2":* "$GUESSDIR/guess:$2" ||
- return 0
-
- local m fn name type kind group
- case "$2" in
- modules:*) kind="module"; group="${2#modules:}" ;;
- modalias:*) kind="modalias"; group="${2#modalias:}" ;;
- opt-modules:*) kind="opt-module"; group="${2#opt-modules:}" ;;
- opt-modalias:*)kind="opt-modalias"; group="${2#opt-modalias:}" ;;
- features) kind="feature"; group="" ;;
- *) kind="$2"; group="" ;;
+ [ -f "$GUESSDIR/guess.tsv" ] || return 0
+
+ local target_var="$1" spec="$2"
+ local target_kind target_group=""
+ case "$spec" in
+ modules:*) target_kind="module"; target_group="${spec#modules:}" ;;
+ modalias:*) target_kind="modalias"; target_group="${spec#modalias:}" ;;
+ opt-modules:*) target_kind="opt-module"; target_group="${spec#opt-modules:}" ;;
+ opt-modalias:*)target_kind="opt-modalias"; target_group="${spec#opt-modalias:}" ;;
+ features) target_kind="feature" ;;
+ *) target_kind="$spec" ;;
esac
- for m in "$GUESSDIR/guess:$2":* "$GUESSDIR/guess:$2"; do
- [ -s "$m" ] ||
- continue
-
- fn="${m##*/guess:}"
- name="${fn##*:}"
- type="${fn%%:*}"
+ declare -a items=()
+ while IFS=$'\t' read -r kind col1 col2 src ctx; do
+ if [ "$target_kind" = "feature" ]; then
+ [ "$kind" = "feature" ] || continue
+ items+=("$col1")
+ else
+ [ "$kind" = "$target_kind" ] || continue
+ [ -z "$target_group" ] || [ "$col1" = "$target_group" ] || continue
+ items+=("$col2")
+ fi
+ done < "$GUESSDIR/guess.tsv"
- [ "$type" = 'features' ] ||
- guess_feature add-modules
+ [ "${#items[@]}" -gt 0 ] || return 0
- if [ -n "${verbose1-}" ]; then
- {
- printf 'Module "%s" propose %s:\n' "$name" "$type"
- sort -u "$m" | modules_fmt
- printf '\n'
- } >&2
- fi
+ if [ "$target_kind" != 'feature' ]; then
+ GUESS_MODULE_NAME="guess-config" guess_feature add-modules
+ fi
- cat "$m"
- done |
- sort -u |
- while read -r item; do
+ if [ "$GUESS_CONFIG_FORMAT" = "tsv" ]; then
+ printf '%s\n' "${items[@]}" | sort -u | while read -r item; do
[ -n "$item" ] || continue
- if [ "$kind" = "module" ] || [ "$kind" = "opt-module" ]; then
+ if [ "$target_kind" = "module" ] || [ "$target_kind" = "opt-module" ]; then
item="${item##*/}"
item="${item%.ko*}"
fi
- if [ -n "$group" ]; then
- printf '%s\t%s\t%s\n' "$kind" "$group" "$item"
+ if [ -n "$target_group" ]; then
+ printf '%s\t%s\t%s\n' "$target_kind" "$target_group" "$item"
else
- printf '%s\t%s\n' "$kind" "$item"
+ printf '%s\t%s\n' "$target_kind" "$item"
fi
done
+ else
+ printf '%s += \\\n' "$target_var"
+ printf '%s\n' "${items[@]}" | sort -u | modules_fmt | sed -e 's/^/\t/; $ ! s/$/ \\/'
+ printf '\n'
+ fi
}
-if [ -n "${RESOLVE_MODALIAS-}" ]; then
- for m in "$GUESSDIR"/guess:modalias*; do
- [ -s "$m" ] ||
- continue
-
- suffix=
- [ -z "${m##*/guess:modalias}" ] ||
- suffix=":${m##*/guess:modalias:}"
-
- depinfo \
- --input="$m" \
- ${USE_MODPROBE_BLACKLIST:+--use-blacklist} \
- --set-version="$KERNEL" \
- --no-deps \
- --no-prefix \
- --no-firmware \
- --no-builtin \
- 2>/dev/null |
- sort -u >> "$GUESSDIR/guess:modules$suffix"
-
- $TRACE_RESOLVE_MODALIAS "$m" "$GUESSDIR/guess:modules$suffix"
-
- rm -f "$m"
- done
-fi
+if [ -n "${RESOLVE_MODALIAS-}" ] && [ -f "$GUESSDIR/guess.tsv" ]; then
+ declare -a modalias_lines=()
+ declare -a remaining_lines=()
-GUESS_CONFIG_FORMAT="${GUESS_CONFIG_FORMAT:-make}"
-while [ "$#" -gt 0 ]; do
- case "$1" in
- --format=*) GUESS_CONFIG_FORMAT="${1#--format=}" ;;
- --format) shift; GUESS_CONFIG_FORMAT="${1-}" ;;
- --tsv) GUESS_CONFIG_FORMAT="tsv" ;;
- --make) GUESS_CONFIG_FORMAT="make" ;;
- *) break ;;
- esac
- shift
-done
+ while IFS=$'\t' read -r kind col1 col2 src ctx; do
+ if [ "$kind" = "modalias" ] || [ "$kind" = "opt-modalias" ]; then
+ modalias_lines+=("$kind"$'\t'"$col1"$'\t'"$col2"$'\t'"$src"$'\t'"$ctx")
+ else
+ remaining_lines+=("$kind"$'\t'"$col1"$'\t'"$col2"$'\t'"$src"$'\t'"$ctx")
+ fi
+ done < "$GUESSDIR/guess.tsv"
+
+ if [ "${#modalias_lines[@]}" -gt 0 ]; then
+ declare -A group_aliases=()
+ for line in "${modalias_lines[@]}"; do
+ IFS=$'\t' read -r kind grp alias src ctx <<< "$line"
+ group_aliases["$kind:$grp"]="${group_aliases["$kind:$grp"]-}$alias"$'\n'
+ done
-if [ "$GUESS_CONFIG_FORMAT" = "tsv" ]; then
- print_vars_tsv
- print_list_tsv RESCUE_MODULES modules:rescue
- print_list_tsv RESCUE_MODULES modalias:rescue
- print_list_tsv MODULES_ADD modules:add
- print_list_tsv MODULES_ADD modalias:add
- print_list_tsv MODULES_TRY_ADD opt-modules:add
- print_list_tsv MODULES_TRY_ADD opt-modalias:add
- print_list_tsv FEATURES features
-else
- print_vars
- print_list RESCUE_MODULES modules:rescue
- print_list RESCUE_MODULES modalias:rescue
- print_list MODULES_ADD modules:add
- print_list MODULES_ADD modalias:add
- print_list MODULES_TRY_ADD opt-modules:add
- print_list MODULES_TRY_ADD opt-modalias:add
- print_list FEATURES features
+ for kgrp in "${!group_aliases[@]}"; do
+ kind="${kgrp%%:*}"
+ grp="${kgrp#*:}"
+ target_kind="module"
+ [ "$kind" != "opt-modalias" ] || target_kind="opt-module"
+
+ resolved=$(printf '%s' "${group_aliases[$kgrp]}" | \
+ depinfo \
+ --input=- \
+ ${USE_MODPROBE_BLACKLIST:+--use-blacklist} \
+ --set-version="$KERNEL" \
+ --no-deps \
+ --no-prefix \
+ --no-firmware \
+ --no-builtin \
+ 2>/dev/null | sort -u)
+
+ while read -r mod; do
+ [ -n "$mod" ] || continue
+ remaining_lines+=("$target_kind"$'\t'"$grp"$'\t'"$mod"$'\tdepinfo'$'\t-')
+ done <<< "$resolved"
+ done
+
+ printf '%s\n' "${remaining_lines[@]}" > "$GUESSDIR/guess.tsv"
+ fi
fi
+
+print_vars
+print_list RESCUE_MODULES modules:rescue
+print_list RESCUE_MODULES modalias:rescue
+print_list MODULES_ADD modules:add
+print_list MODULES_ADD modalias:add
+print_list MODULES_TRY_ADD opt-modules:add
+print_list MODULES_TRY_ADD opt-modalias:add
+print_list FEATURES features
diff --git a/tools/guess-runner b/tools/guess-runner
new file mode 100755
index 00000000..7dc14663
--- /dev/null
+++ b/tools/guess-runner
@@ -0,0 +1,189 @@
+#!/bin/bash -eu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+. sh-functions
+. guess-functions
+
+PROG="${0##*/}"
+
+show_usage() {
+ local rc="${1:-0}"
+ cat <<EOF
+Usage: $PROG [options]
+
+Options:
+ --modules=LIST Initial guess modules to run
+ --disabled=LIST Modules to skip (DISABLE_GUESS)
+ --triggers=LIST Feature-to-guess-modules trigger mappings
+ -v, --verbose Verbose output
+ -h, --help Display this help and exit
+EOF
+ exit "$rc"
+}
+
+initial_modules=
+disabled_list=
+triggers_list=
+verbose=
+
+GETOPT_ALLOW_ABBREV=
+TEMP="$(getopt -n "$PROG" -o "v,h" -l "modules:,disabled:,triggers:,guessdir:,detectdir:,verbose,help" -- "$@")" ||
+ show_usage 1
+eval set -- "$TEMP"
+
+while :; do
+ case "$1" in
+ --modules) shift
+ initial_modules="$1"
+ ;;
+ --disabled) shift
+ disabled_list="$1"
+ ;;
+ --triggers) shift
+ triggers_list="$1"
+ ;;
+ --guessdir) shift
+ GUESSDIR="$1"
+ ;;
+ --detectdir) shift
+ DETECTDIR="$1"
+ ;;
+ -v|--verbose)
+ verbose=1
+ ;;
+ -h|--help)
+ show_usage 0
+ ;;
+ --)
+ shift
+ break
+ ;;
+ *)
+ fatal "$PROG: unrecognized option: $1"
+ ;;
+ esac
+ shift
+done
+
+DETECTDIR="${DETECTDIR:-${PROJECTDIR:-.}/guess}"
+
+[ -n "${GUESSDIR-}" ] || fatal "$PROG: GUESSDIR is not set"
+export GUESSDIR
+mkdir -p -- "$GUESSDIR"
+[ -f "$GUESSDIR/guess.tsv" ] || : > "$GUESSDIR/guess.tsv"
+
+declare -A visited_modules=()
+declare -A disabled_modules=()
+declare -A active_features=()
+declare -A feature_triggers=()
+declare -a queue=()
+
+for mod in $disabled_list; do
+ [ -n "$mod" ] || continue
+ disabled_modules["$mod"]=1
+done
+
+# triggers_list format: "feat1:mod1,mod2 feat2:mod3" or "feat1:mod1 feat1:mod2"
+for pair in ${triggers_list:-${FEATURE_REQUIRES_GUESS-}}; do
+ [ -n "$pair" ] || continue
+ feat="${pair%%:*}"
+ mods="${pair#*:}"
+ mods="${mods//,/ }"
+ feature_triggers["$feat"]="${feature_triggers[$feat]:+${feature_triggers[$feat]} }$mods"
+done
+
+# Initialize active features from environment
+for feat in ${ALL_ACTIVE_FEATURES-}; do
+ [ -n "$feat" ] || continue
+ active_features["$feat"]=1
+done
+
+for mod in $initial_modules; do
+ [ -n "$mod" ] || continue
+ [ -z "${disabled_modules[$mod]-}" ] || continue
+ queue+=("$mod")
+done
+
+# Check if any initially active features trigger modules
+for feat in "${!active_features[@]}"; do
+ trigs="${feature_triggers[$feat]-}"
+ [ -n "$trigs" ] || continue
+ for trig in $trigs; do
+ tmod="${trig%%:*}"
+ tparams="${trig#*:}"
+ if [ "$tparams" != "$trig" ]; then
+ eval "export $tparams"
+ fi
+ [ -z "${disabled_modules[$tmod]-}" ] || continue
+ queue+=("$tmod")
+ done
+done
+
+iteration=0
+max_iterations=10
+
+while [ "${#queue[@]}" -gt 0 ]; do
+ iteration=$((iteration + 1))
+ if [ "$iteration" -gt "$max_iterations" ]; then
+ fatal "$PROG: Exceeded maximum guess iterations limit ($max_iterations)"
+ fi
+
+ current_batch=("${queue[@]}")
+ queue=()
+
+ export GUESS_ITERATION="$iteration"
+
+ for mod in "${current_batch[@]}"; do
+ [ -z "${visited_modules[$mod]-}" ] || continue
+ [ -z "${disabled_modules[$mod]-}" ] || continue
+ visited_modules["$mod"]=1
+
+ action_script="$DETECTDIR/$mod/action"
+ if [ ! -x "$action_script" ]; then
+ continue
+ fi
+
+ export GUESS_MODULE_NAME="guess-$mod"
+ export GUESS_SUFFIX="add:guess-$mod"
+ [ "$mod" != "keyboard" ] || export GUESS_SUFFIX="rescue:guess-$mod"
+ [ "$mod" != "touchscreen" ] || export GUESS_SUFFIX="rescue:guess-$mod"
+
+ if [ -n "$verbose" ]; then
+ msg-timestamp "Processing guess-$mod ..."
+ fi
+
+ "$action_script"
+ done
+
+ # Check for newly activated features in guess.tsv
+ new_features=()
+ if [ -f "$GUESSDIR/guess.tsv" ]; then
+ while IFS=$'\t' read -r kind feat _; do
+ [ "$kind" = "feature" ] || continue
+ [ -n "$feat" ] || continue
+ [ -z "${active_features[$feat]-}" ] || continue
+ active_features["$feat"]=1
+ new_features+=("$feat")
+ done < "$GUESSDIR/guess.tsv"
+ fi
+
+ # Export updated ALL_ACTIVE_FEATURES for scripts using is_active_feature
+ export ALL_ACTIVE_FEATURES="${!active_features[*]}"
+
+ # Trigger dependent modules
+ for feat in "${new_features[@]}"; do
+ trigs="${feature_triggers[$feat]-}"
+ [ -n "$trigs" ] || continue
+
+ for trig in $trigs; do
+ tmod="${trig%%:*}"
+ tparams="${trig#*:}"
+ if [ "$tparams" != "$trig" ]; then
+ eval "export $tparams"
+ fi
+ [ -z "${disabled_modules[$tmod]-}" ] || continue
+ visited_modules["$tmod"]=""
+ queue+=("$tmod")
+ done
+ done
+done
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 4/9] guess: Add guess-explain tool and CLI subcommand for config provenance
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
` (2 preceding siblings ...)
2026-11-12 13:55 ` [make-initrd] [PATCH v1 3/9] guess: Replace recursive Make loop with bash guess-runner Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 5/9] guess: Convert built-in guess modules into feature guess actions Alexey Gladkov
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
Understanding why specific kernel modules or features were included
in the guessed configuration previously required inspecting verbose
logs or internal files.
Add tools/guess-explain to inspect $GUESSDIR/guess.tsv and present
a structured tree showing which guess modules proposed each feature,
kernel module, and configuration variable, along with detection
context. Expose it via `make-initrd guess-explain` and the
`guess-explain` make target.
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
mk/main.mk.in | 16 ++--
testing/tests/ts0065-guess-explain/expect | 23 +++++
testing/tests/ts0065-guess-explain/run | 22 +++++
tools/guess-explain | 110 ++++++++++++++++++++++
utils/make-initrd/make-initrd.in | 6 +-
5 files changed, 170 insertions(+), 7 deletions(-)
create mode 100644 testing/tests/ts0065-guess-explain/expect
create mode 100755 testing/tests/ts0065-guess-explain/run
create mode 100755 tools/guess-explain
diff --git a/mk/main.mk.in b/mk/main.mk.in
index da1adb63..ebd55960 100644
--- a/mk/main.mk.in
+++ b/mk/main.mk.in
@@ -12,7 +12,7 @@ TESTING_PUBLIC_GOALS += test-guess
endif
ifeq ($(MAKELEVEL),0)
-public-goals := all guess-config guess-modules feature-info bug-report $(TESTING_PUBLIC_GOALS)
+public-goals := all guess-config guess-modules guess-explain feature-info bug-report $(TESTING_PUBLIC_GOALS)
private-goals := $(filter-out $(public-goals),$(MAKECMDGOALS))
ifneq ($(private-goals),)
@@ -20,7 +20,7 @@ $(error You MUST NOT call private goals directly: $(private-goals))
endif
endif # MAKELEVEL = 0
-PHONY += all guess-config guess-modules feature-info bug-report
+PHONY += all guess-config guess-modules guess-explain feature-info bug-report
PHONY += check-for-root process-config test-guess
include @projectdir@/mk/config.mk
@@ -38,7 +38,7 @@ check-for-root::
}
endif
-ifneq ($(call in-goals,guess guess-config guess-modules test-guess-actions),)
+ifneq ($(call in-goals,guess guess-config guess-modules guess-explain test-guess-actions),)
include @projectdir@/mk/guess.mk
endif
@@ -74,10 +74,14 @@ guess-config: check-for-root guess
@rm $(verbose3) -rf -- "$(GUESSDIR)"
@rmdir $(verbose3) -- "$(WORKDIR)"
+guess-explain: check-for-root guess
+ @$(TOOLSDIR)/guess-explain >&4
+ @rm $(verbose3) -rf -- "$(GUESSDIR)"
+ @rmdir $(verbose3) -- "$(WORKDIR)"
+
guess-modules: check-for-root guess
- @for f in $(GUESSDIR)/guess:modules* $(GUESSDIR)/guess:modalias*; do \
- [ ! -s "$$f" ] || cat "$$f"; \
- done | \
+ @[ ! -f "$(GUESSDIR)/guess.tsv" ] || \
+ sed -n -E 's/^(module|modalias)\t[^\t]+\t([^\t]+).*/\2/p' "$(GUESSDIR)/guess.tsv" | \
depinfo \
--input=- \
$(if $(USE_MODPROBE_BLACKLIST),--use-blacklist) \
diff --git a/testing/tests/ts0065-guess-explain/expect b/testing/tests/ts0065-guess-explain/expect
new file mode 100644
index 00000000..8618d256
--- /dev/null
+++ b/testing/tests/ts0065-guess-explain/expect
@@ -0,0 +1,23 @@
+Guessed Configuration Provenance:
+
+Features proposed by modules:
+ [guess-common]
+ ├── add-udev-rules
+ ├── cleanup
+ ├── compress
+ [guess-rdshell]
+ ├── rdshell
+ [guess-root]
+ ├── rootfs
+
+Kernel modules / modaliases proposed:
+ [guess-qemu]
+ ├── virtio_balloon (group: add)
+ [guess-root]
+ ├── ext4 (group: add) (context: mount /)
+
+Configuration variables set:
+ [guess-root]
+ ├── MOUNTPOINTS = /
+
+rc=0
diff --git a/testing/tests/ts0065-guess-explain/run b/testing/tests/ts0065-guess-explain/run
new file mode 100755
index 00000000..b0e3379a
--- /dev/null
+++ b/testing/tests/ts0065-guess-explain/run
@@ -0,0 +1,22 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+export GUESSDIR="$tmpdir/guess"
+mkdir -p "$GUESSDIR"
+export PATH="$PWD/.build/dest/usr/bin:$PWD/.build/dest/usr/sbin:$PWD/tools:$PATH"
+
+cat > "$GUESSDIR/guess.tsv" <<EOF
+feature add-udev-rules - guess-common -
+feature cleanup - guess-common -
+feature compress - guess-common -
+feature rdshell - guess-rdshell -
+feature rootfs - guess-root -
+module add ext4 guess-root mount /
+opt-module add virtio_balloon guess-qemu -
+variable MOUNTPOINTS / guess-root -
+EOF
+
+tools/guess-explain
diff --git a/tools/guess-explain b/tools/guess-explain
new file mode 100755
index 00000000..1e18e5e5
--- /dev/null
+++ b/tools/guess-explain
@@ -0,0 +1,110 @@
+#!/bin/bash -eu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+. sh-functions
+
+PROG="${0##*/}"
+
+show_usage() {
+ cat <<EOF
+Usage: $PROG [options]
+
+Display explanation of guessed initramfs configuration.
+
+Options:
+ --file=FILE Path to guess.tsv (default: \$GUESSDIR/guess.tsv)
+ -h, --help Display this help and exit
+EOF
+ exit 0
+}
+
+tsv_file="${GUESSDIR:-.}/guess.tsv"
+
+while [ "$#" -gt 0 ]; do
+ case "$1" in
+ --file=*) tsv_file="${1#--file=}" ;;
+ --file) shift; tsv_file="${1-}" ;;
+ -h|--help) show_usage ;;
+ *) fatal "$PROG: unknown option: $1" ;;
+ esac
+ shift
+done
+
+[ -f "$tsv_file" ] || {
+ echo "No guess information available ($tsv_file not found)"
+ exit 0
+}
+
+declare -A features_by_src=()
+declare -A modules_by_src=()
+declare -A vars_by_src=()
+
+while IFS=$'\t' read -r kind col1 col2 src ctx; do
+ [ "$src" != "-" ] || src="unknown"
+ [ -n "$src" ] || src="unknown"
+ [ "$ctx" != "-" ] || ctx=""
+
+ case "$kind" in
+ feature)
+ detail="$col1"
+ [ -z "$ctx" ] || detail="$detail (context: $ctx)"
+ features_by_src["$src"]="${features_by_src["$src"]-}$detail"$'\n'
+ ;;
+ module|opt-module)
+ detail="$col2 (group: $col1)"
+ [ -z "$ctx" ] || detail="$detail (context: $ctx)"
+ modules_by_src["$src"]="${modules_by_src["$src"]-}$detail"$'\n'
+ ;;
+ modalias|opt-modalias)
+ detail="$col2 (group: $col1)"
+ [ -z "$ctx" ] || detail="$detail (context: $ctx)"
+ modules_by_src["$src"]="${modules_by_src["$src"]-}$detail"$'\n'
+ ;;
+ variable)
+ detail="$col1 = $col2"
+ [ -z "$ctx" ] || detail="$detail (context: $ctx)"
+ vars_by_src["$src"]="${vars_by_src["$src"]-}$detail"$'\n'
+ ;;
+ esac
+done < "$tsv_file"
+
+printf 'Guessed Configuration Provenance:\n\n'
+
+if [ "${#features_by_src[@]}" -gt 0 ]; then
+ printf 'Features proposed by modules:\n'
+ readarray -t sorted_src < <(for s in "${!features_by_src[@]}"; do echo "$s"; done | sort)
+ for s in "${sorted_src[@]}"; do
+ printf ' [%s]\n' "$s"
+ while read -r line; do
+ [ -n "$line" ] || continue
+ printf ' ├── %s\n' "$line"
+ done < <(printf '%s' "${features_by_src[$s]}" | sort -u)
+ done
+ printf '\n'
+fi
+
+if [ "${#modules_by_src[@]}" -gt 0 ]; then
+ printf 'Kernel modules / modaliases proposed:\n'
+ readarray -t sorted_src < <(for s in "${!modules_by_src[@]}"; do echo "$s"; done | sort)
+ for s in "${sorted_src[@]}"; do
+ printf ' [%s]\n' "$s"
+ while read -r line; do
+ [ -n "$line" ] || continue
+ printf ' ├── %s\n' "$line"
+ done < <(printf '%s' "${modules_by_src[$s]}" | sort -u)
+ done
+ printf '\n'
+fi
+
+if [ "${#vars_by_src[@]}" -gt 0 ]; then
+ printf 'Configuration variables set:\n'
+ readarray -t sorted_src < <(for s in "${!vars_by_src[@]}"; do echo "$s"; done | sort)
+ for s in "${sorted_src[@]}"; do
+ printf ' [%s]\n' "$s"
+ while read -r line; do
+ [ -n "$line" ] || continue
+ printf ' ├── %s\n' "$line"
+ done < <(printf '%s' "${vars_by_src[$s]}" | sort -u)
+ done
+ printf '\n'
+fi
diff --git a/utils/make-initrd/make-initrd.in b/utils/make-initrd/make-initrd.in
index 4d17ee25..ab3ca041 100755
--- a/utils/make-initrd/make-initrd.in
+++ b/utils/make-initrd/make-initrd.in
@@ -52,6 +52,10 @@ show_help() {
guesses the current configuration
and generates the config file;
+ guess-explain
+ shows explanation and provenance of guessed
+ configuration;
+
guess-modules [<device>|<directory>]
shows kernel module needed to mount
specified mountpoint or block device;
@@ -179,7 +183,7 @@ done
set -- "${args[@]}"
case "${1-}" in
- guess-config|bug-report)
+ guess-config|guess-explain|bug-report)
;;
guess-modules)
[ "$#" -eq 2 ] ||
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 5/9] guess: Convert built-in guess modules into feature guess actions
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
` (3 preceding siblings ...)
2026-11-12 13:55 ` [make-initrd] [PATCH v1 4/9] guess: Add guess-explain tool and CLI subcommand for config provenance Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 6/9] guess: Remove legacy guess/root and update test fixtures to features/rootfs Alexey Gladkov
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
Having a separate top-level guess/ module tree led to duplication,
split feature logic across two disparate directories, and left
configuration parameters floating outside the feature definitions.
Convert all built-in guess modules into feature guess actions:
- Feature-specific detectors (acpica, bootconfig, lkrg, qemu, rdshell,
smart-card, ucode) move into their respective features/<name>/guess/action.
- guess/net moves to features/modules-network/guess/action.
- guess/device moves to features/modules-blockdev/guess/action.
- guess/root moves to features/rootfs/guess/action (with guess/root/action
kept as a compatibility symlink).
- guess/keyboard, guess/touchscreen, guess/device-tree, and guess/resume
are converted into proper first-class features (modules-keyboard,
modules-touchscreen, modules-device-tree, resume) with their own
config.mk, rules.mk, and guess/action scripts.
- guess/common is retired as a physical module and replaced by a virtual
common module in guess-runner that executes features/*/guess/common.
To preserve 100% backward compatibility with user configurations,
an alias mapping table is implemented in both mk/guess.mk.in and
tools/guess-runner so that AUTODETECT and DISABLE_GUESS continue to
function with legacy short names (net, keyboard, device, root, etc.).
Setting AUTODETECT="" skips all detection including the virtual common
module, and DISABLE_GUESS=common suppresses running features/*/guess/common.
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
.../acpica => features/acpica/guess}/action | 0
.../bootconfig/guess}/action | 0
{guess/lkrg => features/lkrg/guess}/action | 0
features/modules-blockdev/config.mk | 2 +
.../modules-blockdev/guess}/action | 0
features/modules-device-tree/README.md | 1 +
.../modules-device-tree}/config.mk | 1 +
.../modules-device-tree/guess}/action | 0
.../modules-device-tree/rules.mk | 0
features/modules-keyboard/README.md | 1 +
.../modules-keyboard}/config.mk | 2 +
.../modules-keyboard/guess}/action | 0
features/modules-keyboard/rules.mk | 2 +
features/modules-network/config.mk | 2 +
.../modules-network/guess}/action | 0
features/modules-touchscreen/README.md | 1 +
.../config.mk | 0
.../modules-touchscreen/guess}/action | 0
.../modules-touchscreen/rules.mk | 0
{guess/qemu => features/qemu/guess}/action | 0
.../rdshell => features/rdshell/guess}/action | 0
features/resume/README.md | 1 +
{guess/net => features/resume}/config.mk | 3 +-
.../resume => features/resume/guess}/action | 3 +
.../config.mk => features/resume/rules.mk | 0
{guess/root => features/rootfs/guess}/action | 0
.../smart-card/guess}/action | 0
features/sshfsroot/config.mk | 2 +-
{guess/ucode => features/ucode/guess}/action | 0
guess/acpica/README.md | 4 -
guess/acpica/rules.mk | 9 -
guess/bootconfig/README.md | 4 -
guess/bootconfig/rules.mk | 9 -
guess/common/README.md | 5 -
guess/common/action | 10 -
guess/common/rules.mk | 10 -
guess/device-tree/README.md | 13 -
guess/device-tree/rules.mk | 9 -
guess/device/README.md | 8 -
guess/device/rules.mk | 9 -
guess/keyboard/README.md | 3 -
guess/keyboard/rules.mk | 9 -
guess/lkrg/README.md | 3 -
guess/lkrg/rules.mk | 9 -
guess/net/README.md | 9 -
guess/net/rules.mk | 9 -
guess/qemu/README.md | 4 -
guess/qemu/rules.mk | 9 -
guess/rdshell/README.md | 4 -
guess/rdshell/rules.mk | 9 -
guess/resume/README.md | 4 -
guess/resume/rules.mk | 9 -
guess/root/action | 227 +-----------------
guess/smart-card/README.md | 3 -
guess/smart-card/rules.mk | 9 -
guess/touchscreen/README.md | 6 -
guess/touchscreen/rules.mk | 9 -
guess/ucode/README.md | 4 -
guess/ucode/rules.mk | 9 -
mk/guess.mk.in | 24 +-
.../ts0067-guess-autodetect-aliases/expect | 4 +
.../tests/ts0067-guess-autodetect-aliases/run | 46 ++++
tools/guess-runner | 92 ++++++-
63 files changed, 170 insertions(+), 455 deletions(-)
rename {guess/acpica => features/acpica/guess}/action (100%)
rename {guess/bootconfig => features/bootconfig/guess}/action (100%)
rename {guess/lkrg => features/lkrg/guess}/action (100%)
rename {guess/device => features/modules-blockdev/guess}/action (100%)
create mode 100644 features/modules-device-tree/README.md
rename {guess/device-tree => features/modules-device-tree}/config.mk (73%)
rename {guess/device-tree => features/modules-device-tree/guess}/action (100%)
copy guess/smart-card/config.mk => features/modules-device-tree/rules.mk (100%)
create mode 100644 features/modules-keyboard/README.md
rename {guess/keyboard => features/modules-keyboard}/config.mk (81%)
rename {guess/keyboard => features/modules-keyboard/guess}/action (100%)
create mode 100644 features/modules-keyboard/rules.mk
rename {guess/net => features/modules-network/guess}/action (100%)
create mode 100644 features/modules-touchscreen/README.md
copy features/{modules-blockdev => modules-touchscreen}/config.mk (100%)
rename {guess/touchscreen => features/modules-touchscreen/guess}/action (100%)
copy guess/smart-card/config.mk => features/modules-touchscreen/rules.mk (100%)
rename {guess/qemu => features/qemu/guess}/action (100%)
rename {guess/rdshell => features/rdshell/guess}/action (100%)
create mode 100644 features/resume/README.md
rename {guess/net => features/resume}/config.mk (57%)
rename {guess/resume => features/resume/guess}/action (95%)
rename guess/smart-card/config.mk => features/resume/rules.mk (100%)
copy {guess/root => features/rootfs/guess}/action (100%)
rename {guess/smart-card => features/smart-card/guess}/action (100%)
rename {guess/ucode => features/ucode/guess}/action (100%)
delete mode 100644 guess/acpica/README.md
delete mode 100644 guess/acpica/rules.mk
delete mode 100644 guess/bootconfig/README.md
delete mode 100644 guess/bootconfig/rules.mk
delete mode 100644 guess/common/README.md
delete mode 100755 guess/common/action
delete mode 100644 guess/common/rules.mk
delete mode 100644 guess/device-tree/README.md
delete mode 100644 guess/device-tree/rules.mk
delete mode 100644 guess/device/README.md
delete mode 100644 guess/device/rules.mk
delete mode 100644 guess/keyboard/README.md
delete mode 100644 guess/keyboard/rules.mk
delete mode 100644 guess/lkrg/README.md
delete mode 100644 guess/lkrg/rules.mk
delete mode 100644 guess/net/README.md
delete mode 100644 guess/net/rules.mk
delete mode 100644 guess/qemu/README.md
delete mode 100644 guess/qemu/rules.mk
delete mode 100644 guess/rdshell/README.md
delete mode 100644 guess/rdshell/rules.mk
delete mode 100644 guess/resume/README.md
delete mode 100644 guess/resume/rules.mk
mode change 100755 => 120000 guess/root/action
delete mode 100644 guess/smart-card/README.md
delete mode 100644 guess/smart-card/rules.mk
delete mode 100644 guess/touchscreen/README.md
delete mode 100644 guess/touchscreen/rules.mk
delete mode 100644 guess/ucode/README.md
delete mode 100644 guess/ucode/rules.mk
create mode 100644 testing/tests/ts0067-guess-autodetect-aliases/expect
create mode 100755 testing/tests/ts0067-guess-autodetect-aliases/run
diff --git a/guess/acpica/action b/features/acpica/guess/action
similarity index 100%
rename from guess/acpica/action
rename to features/acpica/guess/action
diff --git a/guess/bootconfig/action b/features/bootconfig/guess/action
similarity index 100%
rename from guess/bootconfig/action
rename to features/bootconfig/guess/action
diff --git a/guess/lkrg/action b/features/lkrg/guess/action
similarity index 100%
rename from guess/lkrg/action
rename to features/lkrg/guess/action
diff --git a/features/modules-blockdev/config.mk b/features/modules-blockdev/config.mk
index 6b48966d..01aa672c 100644
--- a/features/modules-blockdev/config.mk
+++ b/features/modules-blockdev/config.mk
@@ -1,2 +1,4 @@
# SPDX-License-Identifier: GPL-3.0-or-later
$(call feature-requires,add-modules depmod-image)
+
+DEVICES ?=
diff --git a/guess/device/action b/features/modules-blockdev/guess/action
similarity index 100%
rename from guess/device/action
rename to features/modules-blockdev/guess/action
diff --git a/features/modules-device-tree/README.md b/features/modules-device-tree/README.md
new file mode 100644
index 00000000..a0833927
--- /dev/null
+++ b/features/modules-device-tree/README.md
@@ -0,0 +1 @@
+This feature detects and includes kernel modules for Open Firmware Device Tree peripherals.
diff --git a/guess/device-tree/config.mk b/features/modules-device-tree/config.mk
similarity index 73%
rename from guess/device-tree/config.mk
rename to features/modules-device-tree/config.mk
index 637694f2..137d4d23 100644
--- a/guess/device-tree/config.mk
+++ b/features/modules-device-tree/config.mk
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
+$(call feature-requires,add-modules depmod-image)
# These filters are complementary to each other.
GUESS_DT_NAMES ?=
diff --git a/guess/device-tree/action b/features/modules-device-tree/guess/action
similarity index 100%
rename from guess/device-tree/action
rename to features/modules-device-tree/guess/action
diff --git a/guess/smart-card/config.mk b/features/modules-device-tree/rules.mk
similarity index 100%
copy from guess/smart-card/config.mk
copy to features/modules-device-tree/rules.mk
diff --git a/features/modules-keyboard/README.md b/features/modules-keyboard/README.md
new file mode 100644
index 00000000..e6ecbed4
--- /dev/null
+++ b/features/modules-keyboard/README.md
@@ -0,0 +1 @@
+This feature provides kernel modules required for keyboard input.
diff --git a/guess/keyboard/config.mk b/features/modules-keyboard/config.mk
similarity index 81%
rename from guess/keyboard/config.mk
rename to features/modules-keyboard/config.mk
index 0326813f..27a539d2 100644
--- a/guess/keyboard/config.mk
+++ b/features/modules-keyboard/config.mk
@@ -1,4 +1,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
+$(call feature-requires,add-modules depmod-image)
+
KEYBOARD_DEFAULT_MODULES ?= \
atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry \
hid-logitech hid-logitech-dj hid-microsoft \
diff --git a/guess/keyboard/action b/features/modules-keyboard/guess/action
similarity index 100%
rename from guess/keyboard/action
rename to features/modules-keyboard/guess/action
diff --git a/features/modules-keyboard/rules.mk b/features/modules-keyboard/rules.mk
new file mode 100644
index 00000000..15703a1a
--- /dev/null
+++ b/features/modules-keyboard/rules.mk
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+MODULES_TRY_ADD += $(KEYBOARD_DEFAULT_MODULES)
diff --git a/features/modules-network/config.mk b/features/modules-network/config.mk
index 6b48966d..56abf53f 100644
--- a/features/modules-network/config.mk
+++ b/features/modules-network/config.mk
@@ -1,2 +1,4 @@
# SPDX-License-Identifier: GPL-3.0-or-later
$(call feature-requires,add-modules depmod-image)
+
+GUESS_NET_IFACE ?=
diff --git a/guess/net/action b/features/modules-network/guess/action
similarity index 100%
rename from guess/net/action
rename to features/modules-network/guess/action
diff --git a/features/modules-touchscreen/README.md b/features/modules-touchscreen/README.md
new file mode 100644
index 00000000..480ced9f
--- /dev/null
+++ b/features/modules-touchscreen/README.md
@@ -0,0 +1 @@
+This feature provides kernel modules required for touchscreen input.
diff --git a/features/modules-blockdev/config.mk b/features/modules-touchscreen/config.mk
similarity index 100%
copy from features/modules-blockdev/config.mk
copy to features/modules-touchscreen/config.mk
diff --git a/guess/touchscreen/action b/features/modules-touchscreen/guess/action
similarity index 100%
rename from guess/touchscreen/action
rename to features/modules-touchscreen/guess/action
diff --git a/guess/smart-card/config.mk b/features/modules-touchscreen/rules.mk
similarity index 100%
copy from guess/smart-card/config.mk
copy to features/modules-touchscreen/rules.mk
diff --git a/guess/qemu/action b/features/qemu/guess/action
similarity index 100%
rename from guess/qemu/action
rename to features/qemu/guess/action
diff --git a/guess/rdshell/action b/features/rdshell/guess/action
similarity index 100%
rename from guess/rdshell/action
rename to features/rdshell/guess/action
diff --git a/features/resume/README.md b/features/resume/README.md
new file mode 100644
index 00000000..117b4b5c
--- /dev/null
+++ b/features/resume/README.md
@@ -0,0 +1 @@
+This feature detects and handles resuming system from suspend-to-disk (hibernation).
diff --git a/guess/net/config.mk b/features/resume/config.mk
similarity index 57%
rename from guess/net/config.mk
rename to features/resume/config.mk
index 572b9d76..ef723722 100644
--- a/guess/net/config.mk
+++ b/features/resume/config.mk
@@ -1,3 +1,2 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-
-GUESS_NET_IFACE ?=
+$(call feature-requires,runtime)
diff --git a/guess/resume/action b/features/resume/guess/action
similarity index 95%
rename from guess/resume/action
rename to features/resume/guess/action
index 1d30b444..a40f9c2e 100755
--- a/guess/resume/action
+++ b/features/resume/guess/action
@@ -29,3 +29,6 @@ for device_file in $device_list; do
# kernel >= 2.6.27
guess_device "/dev/block/$majmin"
done
+
+guess_feature "resume"
+
diff --git a/guess/smart-card/config.mk b/features/resume/rules.mk
similarity index 100%
rename from guess/smart-card/config.mk
rename to features/resume/rules.mk
diff --git a/guess/root/action b/features/rootfs/guess/action
similarity index 100%
copy from guess/root/action
copy to features/rootfs/guess/action
diff --git a/guess/smart-card/action b/features/smart-card/guess/action
similarity index 100%
rename from guess/smart-card/action
rename to features/smart-card/guess/action
diff --git a/features/sshfsroot/config.mk b/features/sshfsroot/config.mk
index fdf66c6a..6df55f03 100644
--- a/features/sshfsroot/config.mk
+++ b/features/sshfsroot/config.mk
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
$(call feature-requires,add-modules depmod-image network)
-$(call guess-requires,net:GUESS_NET_IFACE=all smart-card)
+$(call guess-requires,modules-network:GUESS_NET_IFACE=all smart-card)
SSHFS_DATADIR = $(FEATURESDIR)/sshfsroot/data
SSHFS_PRELOAD = af_packet fs-fuse
diff --git a/guess/ucode/action b/features/ucode/guess/action
similarity index 100%
rename from guess/ucode/action
rename to features/ucode/guess/action
diff --git a/guess/acpica/README.md b/guess/acpica/README.md
deleted file mode 100644
index 06daa4a9..00000000
--- a/guess/acpica/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Guess module: acpica
-
-This module checks for support of upgrading ACPI tables in the kernel and add
-the appropriate feature.
diff --git a/guess/acpica/rules.mk b/guess/acpica/rules.mk
deleted file mode 100644
index 1da50751..00000000
--- a/guess/acpica/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-acpica
-
-guess-acpica: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/acpica/action
-
-guess: guess-acpica
diff --git a/guess/bootconfig/README.md b/guess/bootconfig/README.md
deleted file mode 100644
index 178a7a15..00000000
--- a/guess/bootconfig/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Guess module: bootconfig
-
-This module checks for bootconfig support in the kernel and add the appropriate
-feature. The feature checks the linux kernel config for bootconfig support.
diff --git a/guess/bootconfig/rules.mk b/guess/bootconfig/rules.mk
deleted file mode 100644
index 61c46b3b..00000000
--- a/guess/bootconfig/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-bootconfig
-
-guess-bootconfig: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/bootconfig/action
-
-guess: guess-bootconfig
diff --git a/guess/common/README.md b/guess/common/README.md
deleted file mode 100644
index f870dc5d..00000000
--- a/guess/common/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Guess module: common
-
-Adds features for general use. This module executes scripts `features/*/guess/common`
-unconditionally. These helpers are always executed. Don't disable this feature
-unless you know what you are doing.
diff --git a/guess/common/action b/guess/common/action
deleted file mode 100755
index c79b84ef..00000000
--- a/guess/common/action
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash -efu
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. guess-functions
-
-$TRACE_SOURCE "Processing ..."
-
-for m in $GUESS_COMMON_SCRIPTS; do
- [ ! -x "$m" ] || "$m"
-done
diff --git a/guess/common/rules.mk b/guess/common/rules.mk
deleted file mode 100644
index fd319fe5..00000000
--- a/guess/common/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-common
-
-GUESS_COMMON_SCRIPTS = $(call wildcard-features,guess/common)
-
-guess-common: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ $(DETECTDIR)/common/action
-
-guess: guess-common
diff --git a/guess/device-tree/README.md b/guess/device-tree/README.md
deleted file mode 100644
index 30fba5dd..00000000
--- a/guess/device-tree/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Guess module: device tree
-
-This feature scans the device tree [1] for compatible nodes and determines which
-kernel modules are required for the current hardware. It is intended to be used
-in embedded linux environments where device trees are used to describe hardware.
-
-You can disable this feature by adding to the `/etc/initrd.mk`:
-```
-DISABLE_GUESS += device-tree
-```
-
-[1] https://www.devicetree.org/specifications/
-[2] https://github.com/devicetree-org/devicetree-specification
diff --git a/guess/device-tree/rules.mk b/guess/device-tree/rules.mk
deleted file mode 100644
index f553884c..00000000
--- a/guess/device-tree/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-device-tree
-
-guess-device-tree: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/device-tree/action
-
-guess: guess-device-tree
diff --git a/guess/device/README.md b/guess/device/README.md
deleted file mode 100644
index 0937fdf0..00000000
--- a/guess/device/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Guess module: device
-
-This module finds modules needed to access to `DEVICES`.
-
-## Parameters
-
-- **DEVICES** -- The list of device files for which the required modules and
- parameters are guessed.
diff --git a/guess/device/rules.mk b/guess/device/rules.mk
deleted file mode 100644
index 9f516432..00000000
--- a/guess/device/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-device
-
-guess-device: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/device/action
-
-guess: guess-device
diff --git a/guess/keyboard/README.md b/guess/keyboard/README.md
deleted file mode 100644
index c493cebc..00000000
--- a/guess/keyboard/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Guess module: keyboard
-
-This module tries to guess modules for all input devices.
diff --git a/guess/keyboard/rules.mk b/guess/keyboard/rules.mk
deleted file mode 100644
index 893642a5..00000000
--- a/guess/keyboard/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-keyboard
-
-guess-keyboard: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=rescue:$@ \
- $(DETECTDIR)/keyboard/action
-
-guess: guess-keyboard
diff --git a/guess/lkrg/README.md b/guess/lkrg/README.md
deleted file mode 100644
index cd720680..00000000
--- a/guess/lkrg/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Guess module: lkrg
-
-This module detects the need to add the `lkrg` module.
diff --git a/guess/lkrg/rules.mk b/guess/lkrg/rules.mk
deleted file mode 100644
index c242fd28..00000000
--- a/guess/lkrg/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-lkrg
-
-guess-lkrg: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/lkrg/action
-
-guess: guess-lkrg
diff --git a/guess/net/README.md b/guess/net/README.md
deleted file mode 100644
index 1d6ba782..00000000
--- a/guess/net/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Guess module: net
-
-This modules adds kernel modules for network devices (netboot).
-
-## Parameters
-
-- GUESS_NET_IFACE -- The list of network interfaces (`/sys/class/net/*`) for
- which you want to find modules. If the special word `all` is specified, then
- there will be a search for modules for all network interfaces.
diff --git a/guess/net/rules.mk b/guess/net/rules.mk
deleted file mode 100644
index fd63751c..00000000
--- a/guess/net/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-net
-
-guess-net: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/net/action
-
-guess: guess-net
diff --git a/guess/qemu/README.md b/guess/qemu/README.md
deleted file mode 100644
index 2addb206..00000000
--- a/guess/qemu/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Guess module: qemu
-
-This module detects execution in `qemu` and adds a `qemu` feature that adds modules
-necessary for execution to `qemu`.
diff --git a/guess/qemu/rules.mk b/guess/qemu/rules.mk
deleted file mode 100644
index 33830605..00000000
--- a/guess/qemu/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-qemu
-
-guess-qemu: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/qemu/action
-
-guess: guess-qemu
diff --git a/guess/rdshell/README.md b/guess/rdshell/README.md
deleted file mode 100644
index 91aac079..00000000
--- a/guess/rdshell/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Guess module: rdshell
-
-This module always adds rdshell feature. The module exists to turn off automatic
-adding to the image.
diff --git a/guess/rdshell/rules.mk b/guess/rdshell/rules.mk
deleted file mode 100644
index 36f2051e..00000000
--- a/guess/rdshell/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-rdshell
-
-guess-rdshell: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/rdshell/action
-
-guess: guess-rdshell
diff --git a/guess/resume/README.md b/guess/resume/README.md
deleted file mode 100644
index c4383c98..00000000
--- a/guess/resume/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Guess module: resume
-
-This modules finds modules needed to access hibernation image device. This is
-useful when the device is encrypted or in an unexpected location.`
diff --git a/guess/resume/rules.mk b/guess/resume/rules.mk
deleted file mode 100644
index 00aef137..00000000
--- a/guess/resume/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-resume
-
-guess-resume: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/resume/action
-
-guess: guess-resume
diff --git a/guess/root/action b/guess/root/action
deleted file mode 100755
index fd0c9d3e..00000000
--- a/guess/root/action
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/bash -eu
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. sh-functions
-. guess-functions
-
-$TRACE_SOURCE "Processing ..."
-
-export LIBMOUNT_FSTAB="${FSTAB:-/etc/fstab}"
-export LIBMOUNT_MTAB="${PROC_MOUNTS:-$PROCFS_PATH/mounts}"
-
-if [ "${MAKE_INITRD_BUG_REPORT-}" = 1 ]; then
-
-BLKID_OUT="${BLKID_OUT:-/etc/blkid.out}"
-LIST_FILE="${LIST_FILE:-/dev/list}"
-DEVLIST_FILE="${DEVLIST_FILE:-/dev/devlist}"
-
-unquote()
-{
- local s="$1"
- s="${s#\"}"
- s="${s%\"}"
- printf '%s' "$s"
-}
-
-report_devlist_majmin()
-{
- local devname
-
- devname="$1"; shift
-
- local perm dev
-
- while read -r perm maj min dev; do
- case "$perm" in
- [bc]*)
- maj=$(( 0x$maj ))
- min=$(( 0x$min ))
-
- #printf '%s %s %s\n' "$maj" "$min" "$dev"
-
- [ "$devname" != "$dev" ] ||
- return 0
- ;;
- esac
-
- done < "$DEVLIST_FILE"
- return 1
-}
-
-report_ls_majmin()
-{
- local devname
-
- devname="$1"; shift
-
- local line perm ndev rdev
-
- while read -r line; do
- set -- $line
-
- perm="$1" ndev="" rdev="" maj="" min=""
- shift 4
-
- case "$perm" in
- l*)
- ndev="${5}"
- rdev="${7}"
- ;;
- [bc]*)
- maj="${1%,}"
- min="${2}"
- ndev="${6}"
- rdev="${6}"
-
- [ "$devname" != "$ndev" ] ||
- return 0
- ;;
- esac
-
- done < "$LIST_FILE"
- return 1
-}
-
-report_get_devinfo()
-{
- local spec line
-
- spec="$1"; shift
-
- while read -r line; do
- set -- $line
-
- devname="${1%:}"
- uuid=
- label=
- fstype=
-
- for a; do
- case "$a" in
- UUID=*)
- a="${a#UUID=}"
- uuid="$(unquote "$a")"
- ;;
- LABEL=*)
- a="${a#LABEL=}"
- label="$(unquote "$a")"
- ;;
- TYPE=*)
- a="${a#TYPE=}"
- fstype="$(unquote "$a")"
- ;;
- esac
- done
-
- case "$spec" in
- UUID=*)
- [ "${spec#UUID=}" = "$uuid" ] ||
- continue
- ;;
- LABEL=*)
- [ "${spec#LABEL=}" = "$label" ] ||
- continue
- ;;
- /*)
- [ "$spec" = "$devname" ] ||
- continue
- ;;
- *)
- fatal "not supported: $spec"
- ;;
- esac
-
- return 0
-
- done < "$BLKID_OUT"
-
- return 1
-}
-
-report_findmnt()
-{
- local dir
-
- dir="$1"; shift
-
- local fs_spec fs_file fs_vfstype fs_mntops fs_freq fs_passno
-
- while read -r fs_spec fs_file fs_vfstype fs_mntops fs_freq fs_passno; do
- [ "$dir" = "$fs_file" ] ||
- continue
-
- report_get_devinfo "$fs_spec" ||
- return 1
-
- maj="" min=""
-
- if [ -e "$DEVLIST_FILE" ]; then
- report_devlist_majmin "$devname" ||
- return 1
- else
- report_ls_majmin "$devname" ||
- return 1
- fi
-
- echo "$maj:$min $fstype $devname"
- return 0
-
- done < "$LIBMOUNT_FSTAB"
- return 1
-}
-
-else # MAKE_INITRD_BUG_REPORT
-
-system_findmnt()
-{
- sys_findmnt -n -v -o MAJ:MIN,FSTYPE,SOURCE --target "$1"
-}
-
-fi # MAKE_INITRD_BUG_REPORT
-
-[ "${MOUNTPOINTS-}" == "/" ] ||
- echo "WARNING: Using MOUNTPOINTS variable for guess module is deprecated. Use GUESS_MOUNTPOINTS instead" 1>&2
-
-MORE_MOUNTPOINTS="/"
-
-if [ "$(sys_findmnt -n -o TARGET -T /usr 2>/dev/null ||:)" = /usr ]; then
- MORE_MOUNTPOINTS+=" /usr"
-fi
-
-#
-# Search for options:
-# comment="x-initrd-mount"
-# x-initrd-mount
-#
-MORE_MOUNTPOINTS+=" $(sys_findmnt -s -O x-initrd-mount -no TARGET 2>/dev/null ||:)"
-
-pass=()
-for dir in ${MOUNTPOINTS-} ${GUESS_MOUNTPOINTS-} $MORE_MOUNTPOINTS; do
- ! in_list "$dir" "${pass[@]}" ||
- continue
-
- verbose1 "Processing mount point \`$dir' ..."
-
- [ "${MAKE_INITRD_BUG_REPORT-}" = 1 ] &&
- _findmnt='report_findmnt' ||
- _findmnt='system_findmnt'
-
- out="$($_findmnt "$dir")" ||
- fatal "Unable to find device for '$dir' mount point"
-
- printf '%s\n' "$out" |
- while read -r majmin fstype device; do
- # kernel >= 2.6.27
- [ -z "${majmin##0:*}" ] ||
- guess_device "/dev/block/$majmin"
- guess_fstype "$device" "$fstype" "$dir"
- done
-
- guess_feature rootfs
- guess_feature add-udev-rules
-
- pass+=("$dir")
-done
-
-guess_variable MOUNTPOINTS "${pass[*]}"
diff --git a/guess/root/action b/guess/root/action
new file mode 120000
index 00000000..279e6da8
--- /dev/null
+++ b/guess/root/action
@@ -0,0 +1 @@
+../../features/rootfs/guess/action
\ No newline at end of file
diff --git a/guess/smart-card/README.md b/guess/smart-card/README.md
deleted file mode 100644
index 3b2a5b73..00000000
--- a/guess/smart-card/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Guess module: smart-card
-
-This module adds `smart-card` if `sshfsroot` enabled and `SSHFS_CONFIG` uses PKCS11Provider.
diff --git a/guess/smart-card/rules.mk b/guess/smart-card/rules.mk
deleted file mode 100644
index 01fd25dc..00000000
--- a/guess/smart-card/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-smart-card
-
-guess-smart-card: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/smart-card/action
-
-guess: guess-smart-card
diff --git a/guess/touchscreen/README.md b/guess/touchscreen/README.md
deleted file mode 100644
index 300ea47f..00000000
--- a/guess/touchscreen/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Guess module: touchscreen
-
-This module tries to guess modules for touchscreen devices.
-
-Touchscreen modules may be necessary, for example, if you
-need to enter a password to unlock an encrypted mobile device.
diff --git a/guess/touchscreen/rules.mk b/guess/touchscreen/rules.mk
deleted file mode 100644
index e4194774..00000000
--- a/guess/touchscreen/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-touchscreen
-
-guess-touchscreen: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=rescue:$@ \
- $(DETECTDIR)/touchscreen/action
-
-guess: guess-touchscreen
diff --git a/guess/ucode/README.md b/guess/ucode/README.md
deleted file mode 100644
index 3e090d28..00000000
--- a/guess/ucode/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Guess module: ucode
-
-This module checks for ucode support in the kernel and add the appropriate
-feature.
diff --git a/guess/ucode/rules.mk b/guess/ucode/rules.mk
deleted file mode 100644
index ce98f6c6..00000000
--- a/guess/ucode/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-ucode
-
-guess-ucode: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/ucode/action
-
-guess: guess-ucode
diff --git a/mk/guess.mk.in b/mk/guess.mk.in
index 2446f3bb..51a08cd3 100644
--- a/mk/guess.mk.in
+++ b/mk/guess.mk.in
@@ -8,6 +8,22 @@ endif
-include $(GUESSDIR)/guessed.mk
+GUESS_ALIAS_device = modules-blockdev
+GUESS_ALIAS_device-tree = modules-device-tree
+GUESS_ALIAS_keyboard = modules-keyboard
+GUESS_ALIAS_net = modules-network
+GUESS_ALIAS_root = rootfs
+GUESS_ALIAS_touchscreen = modules-touchscreen
+
+resolve-guess-module = $(or $(GUESS_ALIAS_$(1)),$(1))
+
+RESOLVED_DISABLE_GUESS = $(sort $(DISABLE_GUESS) $(foreach m,$(DISABLE_GUESS),$(GUESS_ALIAS_$(m))))
+
+ALL_FEATURE_GUESS_ACTIONS = $(wildcard $(FEATURESDIR)/*/guess/action)
+ALL_FEATURE_GUESS_MODULES = $(patsubst $(FEATURESDIR)/%/guess/action,%,$(ALL_FEATURE_GUESS_ACTIONS))
+ALL_DETECTDIR_MODULES = $(notdir $(call filter-dirs,$(wildcard $(DETECTDIR)/*)))
+ALL_AVAILABLE_GUESS_MODULES = $(sort common $(ALL_FEATURE_GUESS_MODULES) $(ALL_DETECTDIR_MODULES))
+
GUESS_CONFIG_MODULES = \
$(foreach mod1, \
$(if $(findstring all,$(AUTODETECT)), \
@@ -16,10 +32,10 @@ GUESS_CONFIG_MODULES = \
$(wildcard $(mod1)/config.mk))
GUESS_MODULES = \
- $(sort $(filter-out $(sort $(DISABLE_GUESS)), \
+ $(sort $(filter-out $(RESOLVED_DISABLE_GUESS), \
$(if $(findstring all,$(AUTODETECT)), \
- $(notdir $(call filter-dirs,$(wildcard $(DETECTDIR)/*))), \
- $(AUTODETECT))))
+ $(ALL_AVAILABLE_GUESS_MODULES), \
+ $(foreach mod,$(AUTODETECT),$(call resolve-guess-module,$(mod))))))
-include $(GUESS_CONFIG_MODULES)
@@ -63,6 +79,8 @@ guess-run: prepare-guess
@$(VMSG) "Guessing config ..."
@$(TOOLSDIR)/guess-runner \
$(if $(VERBOSE),-v) \
+ --features-dir="$(FEATURESDIR)" \
+ --common-scripts="$(GUESS_COMMON_SCRIPTS)" \
--modules="$(notdir $(GUESS_MODULES))" \
--disabled="$(DISABLE_GUESS)"
@$(VMSG) "Collection of guessed parameters ..."
diff --git a/testing/tests/ts0067-guess-autodetect-aliases/expect b/testing/tests/ts0067-guess-autodetect-aliases/expect
new file mode 100644
index 00000000..826a7cfd
--- /dev/null
+++ b/testing/tests/ts0067-guess-autodetect-aliases/expect
@@ -0,0 +1,4 @@
+=== Test 1: empty modules ===
+=== Test 2: disabled common with net alias ===
+feature net-driver add:guess-modules-network guess-modules-network -
+rc=0
diff --git a/testing/tests/ts0067-guess-autodetect-aliases/run b/testing/tests/ts0067-guess-autodetect-aliases/run
new file mode 100755
index 00000000..26682f54
--- /dev/null
+++ b/testing/tests/ts0067-guess-autodetect-aliases/run
@@ -0,0 +1,46 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+gdir="$tmpdir/guess"
+featdir="$tmpdir/features"
+mkdir -p "$featdir/modules-network/guess"
+
+cat > "$featdir/modules-network/guess/action" <<'EOF'
+#!/bin/bash -efu
+. guess-functions
+guess_feature net-driver
+EOF
+chmod +x "$featdir/modules-network/guess/action"
+
+common_script="$tmpdir/common.sh"
+cat > "$common_script" <<'EOF'
+#!/bin/bash -efu
+. guess-functions
+guess_feature common-feat
+EOF
+chmod +x "$common_script"
+
+export PATH="$PWD/.build/dest/usr/bin:$PWD/.build/dest/usr/sbin:$PWD/tools:$PATH"
+
+# Test 1: Empty modules (AUTODETECT="") produces no output and skips common
+tools/guess-runner \
+ --guessdir="$gdir" \
+ --features-dir="$featdir" \
+ --common-scripts="$common_script" \
+ --modules=""
+echo "=== Test 1: empty modules ==="
+cat "$gdir/guess.tsv"
+
+# Test 2: DISABLE_GUESS=common disables the virtual common module, net alias runs modules-network
+rm -f "$gdir/guess.tsv"
+tools/guess-runner \
+ --guessdir="$gdir" \
+ --features-dir="$featdir" \
+ --common-scripts="$common_script" \
+ --modules="common net" \
+ --disabled="common"
+echo "=== Test 2: disabled common with net alias ==="
+cat "$gdir/guess.tsv"
diff --git a/tools/guess-runner b/tools/guess-runner
index 7dc14663..383c6e1f 100755
--- a/tools/guess-runner
+++ b/tools/guess-runner
@@ -24,10 +24,11 @@ EOF
initial_modules=
disabled_list=
triggers_list=
+common_scripts=
verbose=
GETOPT_ALLOW_ABBREV=
-TEMP="$(getopt -n "$PROG" -o "v,h" -l "modules:,disabled:,triggers:,guessdir:,detectdir:,verbose,help" -- "$@")" ||
+TEMP="$(getopt -n "$PROG" -o "v,h" -l "modules:,disabled:,triggers:,common-scripts:,guessdir:,detectdir:,features-dir:,verbose,help" -- "$@")" ||
show_usage 1
eval set -- "$TEMP"
@@ -42,12 +43,18 @@ while :; do
--triggers) shift
triggers_list="$1"
;;
+ --common-scripts) shift
+ common_scripts="$1"
+ ;;
--guessdir) shift
GUESSDIR="$1"
;;
--detectdir) shift
DETECTDIR="$1"
;;
+ --features-dir) shift
+ FEATURESDIR="$1"
+ ;;
-v|--verbose)
verbose=1
;;
@@ -65,13 +72,32 @@ while :; do
shift
done
+FEATURESDIR="${FEATURESDIR:-${PROJECTDIR:-.}/features}"
DETECTDIR="${DETECTDIR:-${PROJECTDIR:-.}/guess}"
+common_scripts="${common_scripts:-${GUESS_COMMON_SCRIPTS-}}"
[ -n "${GUESSDIR-}" ] || fatal "$PROG: GUESSDIR is not set"
export GUESSDIR
mkdir -p -- "$GUESSDIR"
[ -f "$GUESSDIR/guess.tsv" ] || : > "$GUESSDIR/guess.tsv"
+declare -A alias_map=(
+ ["device"]="modules-blockdev"
+ ["device-tree"]="modules-device-tree"
+ ["keyboard"]="modules-keyboard"
+ ["net"]="modules-network"
+ ["root"]="rootfs"
+ ["touchscreen"]="modules-touchscreen"
+)
+declare -A rev_alias_map=(
+ ["modules-blockdev"]="device"
+ ["modules-device-tree"]="device-tree"
+ ["modules-keyboard"]="keyboard"
+ ["modules-network"]="net"
+ ["rootfs"]="root"
+ ["modules-touchscreen"]="touchscreen"
+)
+
declare -A visited_modules=()
declare -A disabled_modules=()
declare -A active_features=()
@@ -81,6 +107,8 @@ declare -a queue=()
for mod in $disabled_list; do
[ -n "$mod" ] || continue
disabled_modules["$mod"]=1
+ [ -z "${alias_map[$mod]-}" ] || disabled_modules["${alias_map[$mod]}"]=1
+ [ -z "${rev_alias_map[$mod]-}" ] || disabled_modules["${rev_alias_map[$mod]}"]=1
done
# triggers_list format: "feat1:mod1,mod2 feat2:mod3" or "feat1:mod1 feat1:mod2"
@@ -100,8 +128,10 @@ done
for mod in $initial_modules; do
[ -n "$mod" ] || continue
+ canon_mod="${alias_map[$mod]:-$mod}"
+ [ -z "${disabled_modules[$canon_mod]-}" ] || continue
[ -z "${disabled_modules[$mod]-}" ] || continue
- queue+=("$mod")
+ queue+=("$canon_mod")
done
# Check if any initially active features trigger modules
@@ -114,8 +144,10 @@ for feat in "${!active_features[@]}"; do
if [ "$tparams" != "$trig" ]; then
eval "export $tparams"
fi
+ canon_tmod="${alias_map[$tmod]:-$tmod}"
+ [ -z "${disabled_modules[$canon_tmod]-}" ] || continue
[ -z "${disabled_modules[$tmod]-}" ] || continue
- queue+=("$tmod")
+ queue+=("$canon_tmod")
done
done
@@ -134,22 +166,55 @@ while [ "${#queue[@]}" -gt 0 ]; do
export GUESS_ITERATION="$iteration"
for mod in "${current_batch[@]}"; do
- [ -z "${visited_modules[$mod]-}" ] || continue
+ canon_mod="${alias_map[$mod]:-$mod}"
+ [ -z "${visited_modules[$canon_mod]-}" ] || continue
+ [ -z "${disabled_modules[$canon_mod]-}" ] || continue
[ -z "${disabled_modules[$mod]-}" ] || continue
+ visited_modules["$canon_mod"]=1
visited_modules["$mod"]=1
- action_script="$DETECTDIR/$mod/action"
- if [ ! -x "$action_script" ]; then
+ if [ "$canon_mod" = "common" ]; then
+ if [ -n "$verbose" ]; then
+ msg-timestamp "Processing guess-common ..."
+ fi
+ export GUESS_MODULE_NAME="guess-common"
+ export GUESS_SUFFIX="add:guess-common"
+ for m in $common_scripts; do
+ [ ! -x "$m" ] || "$m"
+ done
+ continue
+ fi
+
+ action_script=""
+ target_mod="$canon_mod"
+
+ if [ -x "$FEATURESDIR/$canon_mod/guess/action" ]; then
+ action_script="$FEATURESDIR/$canon_mod/guess/action"
+ elif [ -x "$FEATURESDIR/$mod/guess/action" ]; then
+ action_script="$FEATURESDIR/$mod/guess/action"
+ target_mod="$mod"
+ elif [ -x "$DETECTDIR/$mod/action" ]; then
+ action_script="$DETECTDIR/$mod/action"
+ target_mod="$mod"
+ elif [ -n "${rev_alias_map[$mod]-}" ] && [ -x "$DETECTDIR/${rev_alias_map[$mod]}/action" ]; then
+ action_script="$DETECTDIR/${rev_alias_map[$mod]}/action"
+ target_mod="${rev_alias_map[$mod]}"
+ fi
+
+ if [ -z "$action_script" ]; then
continue
fi
- export GUESS_MODULE_NAME="guess-$mod"
- export GUESS_SUFFIX="add:guess-$mod"
- [ "$mod" != "keyboard" ] || export GUESS_SUFFIX="rescue:guess-$mod"
- [ "$mod" != "touchscreen" ] || export GUESS_SUFFIX="rescue:guess-$mod"
+ export GUESS_MODULE_NAME="guess-$target_mod"
+ export GUESS_SUFFIX="add:guess-$target_mod"
+ case "$target_mod" in
+ keyboard|modules-keyboard|touchscreen|modules-touchscreen)
+ export GUESS_SUFFIX="rescue:guess-$target_mod"
+ ;;
+ esac
if [ -n "$verbose" ]; then
- msg-timestamp "Processing guess-$mod ..."
+ msg-timestamp "Processing guess-$target_mod ..."
fi
"$action_script"
@@ -181,9 +246,12 @@ while [ "${#queue[@]}" -gt 0 ]; do
if [ "$tparams" != "$trig" ]; then
eval "export $tparams"
fi
+ canon_tmod="${alias_map[$tmod]:-$tmod}"
+ [ -z "${disabled_modules[$canon_tmod]-}" ] || continue
[ -z "${disabled_modules[$tmod]-}" ] || continue
+ visited_modules["$canon_tmod"]=""
visited_modules["$tmod"]=""
- queue+=("$tmod")
+ queue+=("$canon_tmod")
done
done
done
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 6/9] guess: Remove legacy guess/root and update test fixtures to features/rootfs
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
` (4 preceding siblings ...)
2026-11-12 13:55 ` [make-initrd] [PATCH v1 5/9] guess: Convert built-in guess modules into feature guess actions Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 7/9] docs: Update guess and autodetection documentation for feature-based architecture Alexey Gladkov
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
Remove the obsolete guess/root/ directory left as a transitional
symlink during the guess-to-feature migration.
Update testing/tests/guess-rootfs-sh-functions, testing/create-guess-test,
and testing/bugreport-coverage to execute and trace
features/rootfs/guess/action directly.
Update test fixtures in features/lvm, features/mdadm, features/overlayfs,
and features/rootfs to reflect features/rootfs/guess/action in execution
traces and adjust source tracing patterns.
Ensure the target guess/ directory is created by Makefile during build
and installation for third-party guess modules without needing an empty
directory tracked in the repository.
In testing/orchestrator.py, only bind mount the guess/ directory into the
container if it exists on disk, preventing podman statfs errors in CI
environments.
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
Makefile.in | 20 +++---
features/lvm/tests/ts0001-guess-lvm/expect | 64 +++++++++----------
features/lvm/tests/ts0001-guess-lvm/run | 4 +-
.../ts0001-guess-ignore-multipath/expect | 2 +-
.../tests/ts0001-guess-ignore-multipath/run | 2 +-
.../tests/ts0001-guess-overlayfs/expect | 2 +-
.../rootfs/tests/ts0001-guess-rootfs/expect | 34 +++++-----
features/rootfs/tests/ts0001-guess-rootfs/run | 4 +-
guess/root/README.md | 9 ---
guess/root/action | 1 -
guess/root/config.mk | 2 -
guess/root/rules.mk | 9 ---
testing/bugreport-coverage | 6 +-
testing/create-guess-test | 10 +--
testing/orchestrator.py | 16 +++--
testing/tests/guess-rootfs-sh-functions | 4 +-
utils/make-wiki.sh | 3 +
17 files changed, 90 insertions(+), 102 deletions(-)
delete mode 100644 guess/root/README.md
delete mode 120000 guess/root/action
delete mode 100644 guess/root/config.mk
delete mode 100644 guess/root/rules.mk
diff --git a/Makefile.in b/Makefile.in
index 1dddcdaa..cfe839c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,10 +171,11 @@ SED = @SED@ \
build-libs: $(LIBS)
build-progs: build-libs $(PROGS) $(SCRIPTS)
-PROJECT_SUBDIRS = guess tools
+PROJECT_SUBDIRS = tools
FEATURES_SUBDIRS = $(filter-out README.md $(SKIP_FEATURES),$(notdir $(wildcard $(features_srcdir)/*)))
build: $(addprefix $(dest_projectdir)/,$(PROJECT_SUBDIRS))
+build: $(dest_projectdir)/guess
build: $(addprefix $(dest_projectdir)/features/,README.md $(FEATURES_SUBDIRS))
build: build-progs build-libs
@@ -185,18 +186,12 @@ verify:
else \
echo >&2 "WARNING: shellcheck utility not found."; \
fi
- @rc=0; \
- for d in `find $(srcdir)/guess -mindepth 1 -maxdepth 1 -type d`; do \
- [ -f "$$d/README.md" ] || { \
- echo >&2 "ERROR: Guess module has no README: $$d"; rc=1; \
- }; \
- done; exit $$rc; \
-verify: SHELLCHECK_DIRS = $(srcdir)/features $(srcdir)/guess $(srcdir)/tools $(utils_srcdir)
+verify: SHELLCHECK_DIRS = $(srcdir)/features $(srcdir)/tools $(utils_srcdir)
verify: SHELLCHECK_EXCLUDE = SC1003,SC1090,SC1091,SC2004,SC2006,SC2015,SC2034,SC2086,SC2154,SC2295,SC2317,SC2329
UNITTEST_DIRS = $(sort \
- $(foreach 1, guess features runtime mk utils testing, \
+ $(foreach 1, features runtime mk utils testing, \
$(wildcard $(srcdir)/$(1)/tests $(srcdir)/$(1)/*/tests)))
check-unit: $(UNITTEST_DIRS)
@@ -398,6 +393,11 @@ build-manpages: build-progs $(addprefix $(dest_man1dir)/,$(MANPAGE_NAMES))
build: build-manpages
endif
+$(dest_projectdir)/guess:
+ $(Q)mkdir -p -- $(dir $@)
+ $(Q)rm -rf -- "$@"
+ $(Q)$(INSTALL) -d -m 755 -- "$@"
+
$(dest_projectdir)/%: $(srcdir)/%
$(Q)mkdir -p -- $(dir $@)
$(Q)rm -f -- "$@"
@@ -571,6 +571,7 @@ installdirs:
$(DESTDIR)$(sysconfdir) \
$(DESTDIR)$(man1dir) \
$(DESTDIR)$(rulesdir) \
+ $(DESTDIR)$(projectdir)/guess \
$(DESTDIR)$(projectdir)/$(FEATURESDIR) \
$(DESTDIR)$(execdir)/$(FEATURESDIR) \
$(DESTDIR)$(runtimedir)/bin \
@@ -591,6 +592,7 @@ install: build installdirs
done
$(Q)$(INSTALL_DATA) -t "$(DESTDIR)$(rulesdir)" -- $(addprefix $(dest_rulesdir)/,$(RULE_NAMES))
$(Q)cp -at "$(DESTDIR)$(projectdir)" -- $(realpath $(addprefix $(dest_projectdir)/,$(PROJECT_SUBDIRS)))
+ $(Q)$(INSTALL) -d -m 755 -- "$(DESTDIR)$(projectdir)/guess"
$(Q)$(INSTALL) -d -m 755 -- $(addprefix $(DESTDIR)$(projectdir)/$(FEATURESDIR)/,$(FEATURES_SUBDIRS))
$(Q)for n in $(FEATURES_SUBDIRS); do \
find "$(dest_projectdir)/$(FEATURESDIR)/$$n/" -mindepth 1 -maxdepth 1 \
diff --git a/features/lvm/tests/ts0001-guess-lvm/expect b/features/lvm/tests/ts0001-guess-lvm/expect
index 34c0ec06..19a3483b 100644
--- a/features/lvm/tests/ts0001-guess-lvm/expect
+++ b/features/lvm/tests/ts0001-guess-lvm/expect
@@ -1,36 +1,36 @@
-RUN: guess/root/action
-TRACE execute 0 guess/root/action main Processing ...
-TRACE function 1 guess/root/action main guess_device guess_device /dev/block/252:0
-TRACE function 2 guess/root/action main guess_device guess_device guess_device /devices/virtual/block/dm-0/..
-TRACE function 3 guess/root/action main guess_device guess_device guess_device guess_device /devices/virtual/block/..
-TRACE function 4 guess/root/action main guess_device guess_device guess_device guess_device guess_device /devices/virtual/..
-TRACE run 3 guess/root/action main guess_device guess_device guess_device features/lvm/guess/device /devices/virtual
-TRACE run 2 guess/root/action main guess_device guess_device features/lvm/guess/device /devices/virtual/block
-TRACE function 2 guess/root/action main guess_device guess_device guess_device /devices/virtual/block/dm-0/slaves/sda3
-TRACE function 3 guess/root/action main guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/sda3/..
-TRACE function 4 guess/root/action main guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/..
-TRACE function 5 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/..
-TRACE function 6 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias scsi:t-0x00
-TRACE function 6 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/..
-TRACE function 7 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/..
-TRACE function 8 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/..
-TRACE function 9 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v000015ADd000007C0sv000015ADsd000007C0bc01sc07i00
-TRACE function 9 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/..
-TRACE function 10 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/..
-TRACE run 9 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02
-TRACE run 8 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0
-TRACE run 7 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2
-TRACE run 6 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0
-TRACE run 5 guess/root/action main guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0
-TRACE run 4 guess/root/action main guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block
-TRACE run 3 guess/root/action main guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda
-TRACE run 2 guess/root/action main guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/sda3
-TRACE run 1 guess/root/action main guess_device features/lvm/guess/device /devices/virtual/block/dm-0
+RUN: features/rootfs/guess/action
+TRACE execute 0 features/rootfs/guess/action main Processing ...
+TRACE function 1 features/rootfs/guess/action main guess_device guess_device /dev/block/252:0
+TRACE function 2 features/rootfs/guess/action main guess_device guess_device guess_device /devices/virtual/block/dm-0/..
+TRACE function 3 features/rootfs/guess/action main guess_device guess_device guess_device guess_device /devices/virtual/block/..
+TRACE function 4 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device /devices/virtual/..
+TRACE run 3 features/rootfs/guess/action main guess_device guess_device guess_device features/lvm/guess/device /devices/virtual
+TRACE run 2 features/rootfs/guess/action main guess_device guess_device features/lvm/guess/device /devices/virtual/block
+TRACE function 2 features/rootfs/guess/action main guess_device guess_device guess_device /devices/virtual/block/dm-0/slaves/sda3
+TRACE function 3 features/rootfs/guess/action main guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/sda3/..
+TRACE function 4 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/..
+TRACE function 5 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/..
+TRACE function 6 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias scsi:t-0x00
+TRACE function 6 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/..
+TRACE function 7 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/..
+TRACE function 8 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/..
+TRACE function 9 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v000015ADd000007C0sv000015ADsd000007C0bc01sc07i00
+TRACE function 9 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/..
+TRACE function 10 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/..
+TRACE run 9 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02
+TRACE run 8 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0
+TRACE run 7 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2
+TRACE run 6 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0
+TRACE run 5 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0
+TRACE run 4 features/rootfs/guess/action main guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block
+TRACE run 3 features/rootfs/guess/action main guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda
+TRACE run 2 features/rootfs/guess/action main guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/sda3
+TRACE run 1 features/rootfs/guess/action main guess_device features/lvm/guess/device /devices/virtual/block/dm-0
TRACE function 1 features/lvm/guess/device main guess_feature guess_feature lvm
-TRACE function 1 guess/root/action main guess_fstype guess_fstype /dev/mapper/ubuntu--vg-ubuntu--lv ext4 /
-TRACE function 1 guess/root/action main guess_feature guess_feature rootfs
-TRACE function 1 guess/root/action main guess_feature guess_feature add-udev-rules
-TRACE function 1 guess/root/action main guess_variable guess_variable MOUNTPOINTS /
+TRACE function 1 features/rootfs/guess/action main guess_fstype guess_fstype /dev/mapper/ubuntu--vg-ubuntu--lv ext4 /
+TRACE function 1 features/rootfs/guess/action main guess_feature guess_feature rootfs
+TRACE function 1 features/rootfs/guess/action main guess_feature guess_feature add-udev-rules
+TRACE function 1 features/rootfs/guess/action main guess_variable guess_variable MOUNTPOINTS /
RUN: guess-config
variable MOUNTPOINTS /
module add sd_mod
diff --git a/features/lvm/tests/ts0001-guess-lvm/run b/features/lvm/tests/ts0001-guess-lvm/run
index c13a5e49..2f8106d8 100755
--- a/features/lvm/tests/ts0001-guess-lvm/run
+++ b/features/lvm/tests/ts0001-guess-lvm/run
@@ -6,5 +6,5 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-rootfs-sh-functions
guess_rootfs_run_test "$cwd/rootfs.tar.xz" --tsv \
- --src-patterns="features/lvm/guess/* guess/root/action" \
- --run-patterns="features/lvm/guess/* guess/root/action"
+ --src-patterns="features/lvm/guess/* features/rootfs/guess/action" \
+ --run-patterns="features/lvm/guess/* features/rootfs/guess/action"
diff --git a/features/mdadm/tests/ts0001-guess-ignore-multipath/expect b/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
index d4b46c55..d7f0fb80 100644
--- a/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
+++ b/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
@@ -1,4 +1,4 @@
-RUN: guess/root/action
+RUN: features/rootfs/guess/action
TRACE function 1 features/mdadm/guess/device main guess_variable guess_variable MDADM_EXTRA_PROGS mdmon
TRACE function 1 features/mdadm/guess/device main guess_device guess_device /devices/virtual/block/md126/md/dev-nvme0n1/block
TRACE run 1 features/mdadm/guess/device main guess_device modalias /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
diff --git a/features/mdadm/tests/ts0001-guess-ignore-multipath/run b/features/mdadm/tests/ts0001-guess-ignore-multipath/run
index 4b63c84f..97dfb2a9 100755
--- a/features/mdadm/tests/ts0001-guess-ignore-multipath/run
+++ b/features/mdadm/tests/ts0001-guess-ignore-multipath/run
@@ -6,6 +6,6 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-rootfs-sh-functions
guess_rootfs_run_test "$cwd/rootfs.tar.xz" --tsv \
- --src-patterns="features/*/guess/* features/rootfs/guess/fstype" \
+ --src-patterns="features/*/guess/device features/*/guess/fstype" \
--run-patterns="*" \
-k "6.6.41-un-def-alt0.p11.1"
diff --git a/features/overlayfs/tests/ts0001-guess-overlayfs/expect b/features/overlayfs/tests/ts0001-guess-overlayfs/expect
index e8f9709f..0abd6f09 100644
--- a/features/overlayfs/tests/ts0001-guess-overlayfs/expect
+++ b/features/overlayfs/tests/ts0001-guess-overlayfs/expect
@@ -1,4 +1,4 @@
-RUN: guess/root/action
+RUN: features/rootfs/guess/action
TRACE function 1 features/overlayfs/guess/fstype main guess_fstype guess_fstype /dev/loop0 squashfs
TRACE run 1 features/overlayfs/guess/fstype main guess_fstype features/overlayfs/guess/fstype /dev/loop0 squashfs
TRACE function 1 features/rootfs/guess/fstype main guess_modalias guess_modalias fs-squashfs
diff --git a/features/rootfs/tests/ts0001-guess-rootfs/expect b/features/rootfs/tests/ts0001-guess-rootfs/expect
index 128058b0..918031af 100644
--- a/features/rootfs/tests/ts0001-guess-rootfs/expect
+++ b/features/rootfs/tests/ts0001-guess-rootfs/expect
@@ -1,21 +1,21 @@
-RUN: guess/root/action
-TRACE execute 0 guess/root/action main Processing ...
-TRACE function 1 guess/root/action main guess_device guess_device /dev/block/259:2
-TRACE function 2 guess/root/action main guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/nvme0/nvme0n1/nvme0n1p2/..
-TRACE function 3 guess/root/action main guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/nvme0/nvme0n1/..
-TRACE function 4 guess/root/action main guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/nvme0/..
-TRACE function 5 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/..
-TRACE function 6 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v000015B7d00005009sv000015B7sd00005009bc01sc08i02
-TRACE function 6 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/..
-TRACE function 7 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v00001022d00001483sv00001022sd00001234bc06sc04i00
-TRACE function 7 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/..
-TRACE function 8 guess/root/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/..
-TRACE function 1 guess/root/action main guess_fstype guess_fstype /dev/nvme0n1p2 ext4 /
-TRACE run 1 guess/root/action main guess_fstype features/rootfs/guess/fstype /dev/nvme0n1p2 ext4 /
+RUN: features/rootfs/guess/action
+TRACE execute 0 features/rootfs/guess/action main Processing ...
+TRACE function 1 features/rootfs/guess/action main guess_device guess_device /dev/block/259:2
+TRACE function 2 features/rootfs/guess/action main guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/nvme0/nvme0n1/nvme0n1p2/..
+TRACE function 3 features/rootfs/guess/action main guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/nvme0/nvme0n1/..
+TRACE function 4 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/nvme0/..
+TRACE function 5 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/nvme/..
+TRACE function 6 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v000015B7d00005009sv000015B7sd00005009bc01sc08i02
+TRACE function 6 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/0000:01:00.0/..
+TRACE function 7 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v00001022d00001483sv00001022sd00001234bc06sc04i00
+TRACE function 7 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:01.1/..
+TRACE function 8 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/..
+TRACE function 1 features/rootfs/guess/action main guess_fstype guess_fstype /dev/nvme0n1p2 ext4 /
+TRACE run 1 features/rootfs/guess/action main guess_fstype features/rootfs/guess/fstype /dev/nvme0n1p2 ext4 /
TRACE function 1 features/rootfs/guess/fstype main guess_modalias guess_modalias fs-ext4
-TRACE function 1 guess/root/action main guess_feature guess_feature rootfs
-TRACE function 1 guess/root/action main guess_feature guess_feature add-udev-rules
-TRACE function 1 guess/root/action main guess_variable guess_variable MOUNTPOINTS /
+TRACE function 1 features/rootfs/guess/action main guess_feature guess_feature rootfs
+TRACE function 1 features/rootfs/guess/action main guess_feature guess_feature add-udev-rules
+TRACE function 1 features/rootfs/guess/action main guess_variable guess_variable MOUNTPOINTS /
RUN: guess-config
variable MOUNTPOINTS /
modalias add fs-ext4
diff --git a/features/rootfs/tests/ts0001-guess-rootfs/run b/features/rootfs/tests/ts0001-guess-rootfs/run
index b3efb1e2..6e692f3c 100755
--- a/features/rootfs/tests/ts0001-guess-rootfs/run
+++ b/features/rootfs/tests/ts0001-guess-rootfs/run
@@ -6,5 +6,5 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-rootfs-sh-functions
guess_rootfs_run_test "$cwd/rootfs.tar.xz" --tsv \
- --src-patterns="features/rootfs/guess/fstype guess/root/action" \
- --run-patterns="features/rootfs/guess/fstype guess/root/action"
+ --src-patterns="features/rootfs/guess/fstype features/rootfs/guess/action" \
+ --run-patterns="features/rootfs/guess/fstype features/rootfs/guess/action"
diff --git a/guess/root/README.md b/guess/root/README.md
deleted file mode 100644
index ef1e81c5..00000000
--- a/guess/root/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Guess module: root
-
-This module finds modules needed to access root filesystem device and the
-filesystem itself (if they are not added in the kernel).
-
-# Parameters
-
-- **GUESS_MOUNTPOINTS** -- this is a list of mountpoints. The kernel modules will be
- found for devices mounted at these mountpoints.
diff --git a/guess/root/action b/guess/root/action
deleted file mode 120000
index 279e6da8..00000000
--- a/guess/root/action
+++ /dev/null
@@ -1 +0,0 @@
-../../features/rootfs/guess/action
\ No newline at end of file
diff --git a/guess/root/config.mk b/guess/root/config.mk
deleted file mode 100644
index 784cd470..00000000
--- a/guess/root/config.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-GUESS_MOUNTPOINTS ?=
diff --git a/guess/root/rules.mk b/guess/root/rules.mk
deleted file mode 100644
index 7d2df16e..00000000
--- a/guess/root/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-PHONY += guess-root
-
-guess-root: prepare-guess
- @$(VMSG) "Processing $@ ..."
- @ GUESS_SUFFIX=add:$@ \
- $(DETECTDIR)/root/action
-
-guess: guess-root
diff --git a/testing/bugreport-coverage b/testing/bugreport-coverage
index 4511f13f..98bb067a 100755
--- a/testing/bugreport-coverage
+++ b/testing/bugreport-coverage
@@ -89,14 +89,14 @@ def run_replay(report_root: Path, kernel: str | None, modules_dir: Path) -> tupl
"DEVLIST_FILE": str(report_root / "dev" / "devlist"),
"KERNEL_MODULES_DIR": str(modules_dir),
"GUESS_SUFFIX": "add:guess-root",
- "TEST_GUESS_ACTIONS": "guess/root/action guess-config",
+ "TEST_GUESS_ACTIONS": "features/rootfs/guess/action guess-config",
"RESOLVE_MODALIAS": "",
"KERNEL_CONFIG": "/dev/null",
"MAKE_INITRD_TRACE": "1",
"MAKE_INITRD_TRACE_FORMAT": "tsv",
"MAKE_INITRD_TRACE_PIDS": "",
- "MAKE_INITRD_TRACE_EXECUTE_PATTERNS": "guess/root/action",
- "MAKE_INITRD_TRACE_SRC_PATTERNS": "features/*/guess/* guess/root/action",
+ "MAKE_INITRD_TRACE_EXECUTE_PATTERNS": "features/rootfs/guess/action",
+ "MAKE_INITRD_TRACE_SRC_PATTERNS": "features/*/guess/*",
"MAKE_INITRD_TRACE_RUN_PATTERNS": "*",
}
)
diff --git a/testing/create-guess-test b/testing/create-guess-test
index 34b565b2..ab4614d0 100755
--- a/testing/create-guess-test
+++ b/testing/create-guess-test
@@ -98,12 +98,12 @@ def run_test_guess(
"DEVLIST_FILE": str(report_root / "dev" / "devlist"),
"KERNEL_MODULES_DIR": str(modules_dir),
"GUESS_SUFFIX": "add:guess-root",
- "TEST_GUESS_ACTIONS": "guess/root/action guess-config",
+ "TEST_GUESS_ACTIONS": "features/rootfs/guess/action guess-config",
"RESOLVE_MODALIAS": "",
"KERNEL_CONFIG": "/dev/null",
"MAKE_INITRD_TRACE": "1",
"MAKE_INITRD_TRACE_PIDS": "",
- "MAKE_INITRD_TRACE_EXECUTE_PATTERNS": "guess/root/action",
+ "MAKE_INITRD_TRACE_EXECUTE_PATTERNS": "features/rootfs/guess/action",
"MAKE_INITRD_TRACE_SRC_PATTERNS": src_patterns,
"MAKE_INITRD_TRACE_RUN_PATTERNS": run_patterns,
"MAKE_INITRD_TRACE_FORMAT": "tsv" if output_format == "tsv" else "text",
@@ -235,7 +235,7 @@ def parse_args() -> argparse.Namespace:
parser.add_argument(
"-s",
"--src-patterns",
- help="MAKE_INITRD_TRACE_SRC_PATTERNS (default: features/<feature>/guess/* guess/root/action)",
+ help="MAKE_INITRD_TRACE_SRC_PATTERNS (default: features/<feature>/guess/* features/rootfs/guess/action)",
)
parser.add_argument(
"-r",
@@ -278,9 +278,9 @@ def main() -> None:
src_patterns = args.src_patterns
if not src_patterns:
if args.feature:
- src_patterns = f"features/{args.feature}/guess/* guess/root/action"
+ src_patterns = f"features/{args.feature}/guess/* features/rootfs/guess/action"
else:
- src_patterns = "features/*/guess/* guess/root/action"
+ src_patterns = "features/*/guess/* features/rootfs/guess/action"
run_patterns = args.run_patterns or src_patterns
diff --git a/testing/orchestrator.py b/testing/orchestrator.py
index 2bad1d59..839b0ff8 100755
--- a/testing/orchestrator.py
+++ b/testing/orchestrator.py
@@ -820,16 +820,20 @@ def step_build_sysimage(ctx: Context) -> None:
with gh_group("packing sysimage"):
run_sh = ctx.top_workdir / "run.sh"
write_executable(run_sh, pack_sysimage_script(ctx))
+ mounts = [
+ "--mount", f"type=image,src=localhost/image-{ctx.vendor.name}:sysimage,dst=/image",
+ "--mount", f"type=tmpfs,destination=/image{ctx.builddir}",
+ "--mount", f"type=bind,src={ctx.topdir}/.build/dest,dst=/image{ctx.builddir}/.build/dest",
+ "--mount", f"type=bind,src={ctx.topdir}/features,dst=/image{ctx.builddir}/features",
+ "--mount", f"type=bind,src={ctx.topdir}/tools,dst=/image{ctx.builddir}/tools",
+ ]
+ if (ctx.topdir / "guess").is_dir():
+ mounts += ["--mount", f"type=bind,src={ctx.topdir}/guess,dst=/image{ctx.builddir}/guess"]
run_command(
ctx,
[
"podman", "run", "--rm", "-i",
- "--mount", f"type=image,src=localhost/image-{ctx.vendor.name}:sysimage,dst=/image",
- "--mount", f"type=tmpfs,destination=/image{ctx.builddir}",
- "--mount", f"type=bind,src={ctx.topdir}/.build/dest,dst=/image{ctx.builddir}/.build/dest",
- "--mount", f"type=bind,src={ctx.topdir}/features,dst=/image{ctx.builddir}/features",
- "--mount", f"type=bind,src={ctx.topdir}/guess,dst=/image{ctx.builddir}/guess",
- "--mount", f"type=bind,src={ctx.topdir}/tools,dst=/image{ctx.builddir}/tools",
+ *mounts,
f"--volume={ctx.topdir}:/host",
f"localhost/image-{ctx.vendor.name}:devel",
f"/host/{ctx.workdir_rel}/run.sh",
diff --git a/testing/tests/guess-rootfs-sh-functions b/testing/tests/guess-rootfs-sh-functions
index 0e1b5aa6..be7d49ac 100644
--- a/testing/tests/guess-rootfs-sh-functions
+++ b/testing/tests/guess-rootfs-sh-functions
@@ -39,13 +39,13 @@ guess_rootfs_setup_dir()
export KERNEL_MODULES_DIR="$modulesdir"
export GUESS_SUFFIX="${GUESS_SUFFIX:-add:guess-root}"
- export TEST_GUESS_ACTIONS="${TEST_GUESS_ACTIONS:-guess/root/action guess-config}"
+ export TEST_GUESS_ACTIONS="${TEST_GUESS_ACTIONS:-features/rootfs/guess/action guess-config}"
export RESOLVE_MODALIAS="${RESOLVE_MODALIAS-}"
export KERNEL_CONFIG="${KERNEL_CONFIG:-/dev/null}"
export MAKE_INITRD_TRACE="${MAKE_INITRD_TRACE:-1}"
export MAKE_INITRD_TRACE_PIDS="${MAKE_INITRD_TRACE_PIDS-}"
- export MAKE_INITRD_TRACE_EXECUTE_PATTERNS="${MAKE_INITRD_TRACE_EXECUTE_PATTERNS:-guess/root/action}"
+ export MAKE_INITRD_TRACE_EXECUTE_PATTERNS="${MAKE_INITRD_TRACE_EXECUTE_PATTERNS:-features/rootfs/guess/action}"
export MAKE_INITRD_TRACE_FORMAT="${MAKE_INITRD_TRACE_FORMAT:-text}"
export GUESS_CONFIG_FORMAT="${GUESS_CONFIG_FORMAT:-make}"
}
diff --git a/utils/make-wiki.sh b/utils/make-wiki.sh
index 203fb215..195111a8 100755
--- a/utils/make-wiki.sh
+++ b/utils/make-wiki.sh
@@ -12,6 +12,9 @@ copy_readme()
prefix="$1"; shift
wikiprefix="$1"; shift
+ [ -d "$subname" ] ||
+ return 0
+
find "$subname" -mindepth 2 -name README.md -printf '%p\n' |
sort |
while read -r file; do
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 7/9] docs: Update guess and autodetection documentation for feature-based architecture
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
` (5 preceding siblings ...)
2026-11-12 13:55 ` [make-initrd] [PATCH v1 6/9] guess: Remove legacy guess/root and update test fixtures to features/rootfs Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 8/9] guess: Cache visited sysfs device nodes during autodetection Alexey Gladkov
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
Update documentation across the project for the refactored guess
subsystem:
- Update Documentation/GuessConfiguration.md to document the feature-based
autodetection architecture, guess-runner iterative convergence,
guess-explain CLI provenance tool, AUTODETECT and DISABLE_GUESS
configuration options with legacy aliases, the full module/alias table,
and feature detection hooks (action, device, fstype, common).
- Update Documentation/NewFeature.md with a dedicated section on feature
guess/ hooks, guess-requires dependency declarations, and guess-functions
shell helpers.
- Add guess-explain documentation to Documentation/MakeInitrdArguments.md
and Documentation/manpages/make-initrd.1.md.
- Update AUTODETECT and DISABLE_GUESS in Documentation/Configuration.md.
- Update feature READMEs (modules-blockdev, modules-device-tree,
modules-keyboard, modules-network, modules-touchscreen, resume, rootfs)
with canonical feature headers, parameter docs, and guess descriptions.
- Update utils/make-wiki.sh to drop obsolete references to the removed
top-level guess/ directory.
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
Documentation/Configuration.md | 13 +-
Documentation/GuessConfiguration.md | 159 +++++++++++++++++++++---
Documentation/MakeInitrdArguments.md | 4 +
Documentation/NewFeature.md | 41 ++++++
Documentation/manpages/make-initrd.1.md | 7 ++
features/modules-blockdev/README.md | 5 +
features/modules-device-tree/README.md | 17 ++-
features/modules-keyboard/README.md | 13 +-
features/modules-network/README.md | 6 +
features/modules-touchscreen/README.md | 16 ++-
features/resume/README.md | 14 ++-
features/rootfs/README.md | 7 +-
utils/make-wiki.sh | 3 -
13 files changed, 276 insertions(+), 29 deletions(-)
diff --git a/Documentation/Configuration.md b/Documentation/Configuration.md
index 1fe60104..26122529 100644
--- a/Documentation/Configuration.md
+++ b/Documentation/Configuration.md
@@ -18,16 +18,21 @@ There are few types of settings:
### System Detection Settings
-- **AUTODETECT** - This variable contains the list of subsystems which add
- appropriate kernel modules and features automatically.
+- **AUTODETECT** - This variable contains the list of detection modules to run
+ automatically (default: `all`). Setting it empty (`AUTODETECT =`) completely
+ disables autodetection. Both canonical feature names (for example `modules-network`)
+ and legacy short aliases (for example `net`) can be used.
- **KERNEL** - The variable specifies kernel version for corresponding modules
in the image. Default: `$(uname -r)`
- **DISABLE_GUESS** - The variable lists guess modules that should NOT run.
+ Supports canonical feature names, legacy aliases, and `common` (which disables
+ generic detection hooks).
- **DEVICES** - The variable lists device files (for example `/dev/sda1`) for
which you want to add modules.
-More details on how the guessing mechanism works can be found
-[here](GuessConfiguration.md).
+You can inspect the results and provenance of autodetection using
+`make-initrd guess-explain`. More details on how the guessing mechanism works
+can be found [here](GuessConfiguration.md).
### Image Generation Settings
diff --git a/Documentation/GuessConfiguration.md b/Documentation/GuessConfiguration.md
index cc2c96b2..8b3736c0 100644
--- a/Documentation/GuessConfiguration.md
+++ b/Documentation/GuessConfiguration.md
@@ -16,32 +16,43 @@ AUTODETECT = all
# How It Works ?
Before actually generating the image, `make-initrd` parses the **current**
-configuration.
+hardware and mountpoint configuration.
Quite a long time ago, a wonderful sysfs virtual file system appeared in the
linux kernel. It is usually mounted in `/sys`. It is required for many purposes
and is usually always mounted on the system. To guess the hardware
-configuration, `make-initrd` parses `/sys` and must have privileges to read any
-data from there.
+configuration, `make-initrd` parses `/sys` and `/proc` and must have privileges
+to read data from there.
Creating an image consists of two parts:
* Creation of internal config based on the user config (`/etc/initrd.mk`).
* Creating an image based on an internal temporary config.
-After determining the list of devices of interest (paths in `/sys`), the
-autodetect process executes guess modules that complete the internal temporary
-configuration. These modules are located in the `guess/*` directory. Also,
-features can have callbacks to enable certain features.
-
-Some of the guess modules require parameters. These options are also specified
-in `/etc/initrd.mk`.
-
-You can read more about individual guess modules [here](GuessConfiguration.md#list-of-modules).
+## Detection Architecture
+
+Autodetection is organized directly around feature modules:
+
+* Built-in detection logic is implemented inside feature directories:
+ `features/<feature>/guess/`.
+* Custom or third-party detection modules can be placed in `guess/<name>/action`
+ or `/usr/share/make-initrd/guess/<name>/action`.
+* The detection engine (`guess-runner`) runs detection modules in iterative
+ batches:
+ 1. It starts with the initial queue of modules specified by `AUTODETECT`
+ (or all available modules if `AUTODETECT = all`).
+ 2. Each module's `guess/action` script executes and records proposals
+ (features, kernel modules, modaliases, configuration variables) into a
+ structured provenance log (`guess.tsv`).
+ 3. When new features are proposed, their declared dependencies
+ (`$(call guess-requires, <module>...)` in `config.mk`) dynamically trigger
+ further detection modules into the queue.
+ 4. The loop repeats until all required modules have run and no new dependencies
+ are discovered (convergence).
## Step-by-Step Example
-To understand how /sys is used to find kernel modules, let's take an example and
+To understand how `/sys` is used to find kernel modules, let's take an example and
replay the steps of guess modules. Let's say, we need to find all kernel modules
that requires a root mountpoint. Again, this is just an illustration of the
sequence of steps.
@@ -105,7 +116,11 @@ So, we need to add modules to the initramfs: `nvme`, `nvme-core` and `t10-pi`.
This is how `make-initrd` looks for kernel modules using `/sys`.
-## Guess Configuration File
+# Autodetection Goals
+
+`make-initrd` provides several CLI commands for inspecting and utilizing autodetection:
+
+## Guess Configuration File (`guess-config`)
Using guess modules, you can generate a minimal config for your system:
@@ -124,7 +139,7 @@ FEATURES += \
gpu-drm network rdshell rootfs system-glibc ucode
```
-## Guess Modules
+## Guess Modules (`guess-modules`)
You can also see what modules are required for any mountpoint or block device.
@@ -139,6 +154,116 @@ $ make-initrd -D guess-modules /
/lib/modules/5.14.0/kernel/fs/mbcache.ko
```
-# List of Modules
+## Configuration Provenance & Explainability (`guess-explain`)
+
+To inspect why specific features, kernel drivers, or variables were proposed,
+use `guess-explain`:
+
+```bash
+$ make-initrd guess-explain
+```
+```text
+Guessed Configuration Provenance:
+
+Features proposed by modules:
+ [guess-acpica]
+ ├── acpica
+ [guess-common]
+ ├── add-udev-rules
+ ├── cleanup
+ ├── compress
+ [guess-config]
+ ├── add-modules
+ [guess-rdshell]
+ ├── rdshell
+ [guess-rootfs]
+ ├── add-udev-rules
+ ├── rootfs
+ [guess-ucode]
+ ├── ucode
+
+Kernel modules / modaliases proposed:
+ [depinfo]
+ ├── /lib/modules/.../kernel/drivers/hid/hid-generic.ko (group: rescue)
+ ├── /lib/modules/.../kernel/drivers/hid/usbhid/usbhid.ko (group: rescue)
+
+Configuration variables set:
+ [guess-rootfs]
+ ├── MOUNTPOINTS = /
+```
-Below is a list of guess modules.
+# Configuration Parameters
+
+Autodetection behavior can be customized in `/etc/initrd.mk`:
+
+* **`AUTODETECT`**: List of guess modules to run. Default is `all`.
+ - Setting `AUTODETECT =` completely disables autodetection (no guess modules
+ and no `common` hooks are executed).
+ - You can specify exact modules to run, using either canonical feature names
+ or legacy short aliases:
+ ```make
+ AUTODETECT = modules-network rootfs
+ # or using aliases:
+ AUTODETECT = net root
+ ```
+
+* **`DISABLE_GUESS`**: List of guess modules to skip.
+ - Supports both canonical names and legacy aliases:
+ ```make
+ DISABLE_GUESS = modules-network
+ # or using alias:
+ DISABLE_GUESS = net
+ ```
+ - Disabling `common` (`DISABLE_GUESS = common`) skips all generic hooks
+ provided by `features/*/guess/common`.
+
+* **Feature-specific detection options**:
+ - `GUESS_NET_IFACE` (in [modules-network](features/modules-network/README.md)):
+ specifies which network interfaces to inspect (`all`, `auto`, or a list of
+ interface names).
+ - `DEVICES` (in [modules-blockdev](features/modules-blockdev/README.md)):
+ specifies explicit block device nodes to detect kernel drivers for.
+
+# Detection Modules and Aliases
+
+The table below lists the built-in detection modules provided by features:
+
+| Canonical Module | Legacy Alias | Description |
+|:-----------------|:-------------|:------------|
+| [modules-blockdev](features/modules-blockdev/README.md) | `device` | Detects storage drivers for devices listed in `$DEVICES` |
+| [modules-device-tree](features/modules-device-tree/README.md) | `device-tree` | Detects hardware drivers from Device Tree (`/sys/firmware/devicetree`) |
+| [modules-keyboard](features/modules-keyboard/README.md) | `keyboard` | Detects drivers for input keyboards |
+| [modules-network](features/modules-network/README.md) | `net` | Detects kernel drivers for network interfaces (`$GUESS_NET_IFACE`) |
+| [modules-touchscreen](features/modules-touchscreen/README.md) | `touchscreen` | Detects touchscreen input drivers |
+| [resume](features/resume/README.md) | `resume` | Detects hibernation resume partition or swap device |
+| [rootfs](features/rootfs/README.md) | `root` | Detects root filesystem, mountpoints, and underlying storage (LVM, LUKS, RAID, bcache, overlayfs, zfs) |
+| [acpica](features/acpica/README.md) | `acpica` | Detects ACPI table support requirements |
+| [bootconfig](features/bootconfig/README.md) | `bootconfig` | Detects kernel bootconfig support |
+| [lkrg](features/lkrg/README.md) | `lkrg` | Detects Linux Kernel Runtime Guard |
+| [qemu](features/qemu/README.md) | `qemu` | Detects execution in QEMU virtual machine environment |
+| [rdshell](features/rdshell/README.md) | `rdshell` | Proposes rescue shell support if enabled |
+| [smart-card](features/smart-card/README.md) | `smart-card` | Detects smart card reader hardware |
+| [ucode](features/ucode/README.md) | `ucode` | Detects CPU microcode requirements (Intel / AMD) |
+| `common` | `common` | Virtual module that runs generic detection hooks (`features/*/guess/common`) |
+
+# Feature Detection Hooks
+
+Inside each feature directory (`features/<feature>/guess/`), four types of scripts
+can participate in autodetection:
+
+1. **`guess/action`**: The main detection script for the feature, run by `guess-runner`
+ when the module is scheduled.
+2. **`guess/device`**: Hook script invoked by `rootfs` while traversing parent devices
+ in the `/sys` block device hierarchy. Used to detect block layers like LVM,
+ LUKS, MDADM, bcache, or devmapper.
+3. **`guess/fstype`**: Hook script invoked by `rootfs` to identify filesystem types
+ and propose appropriate filesystem drivers (e.g. ext4, btrfs, xfs, zfs, overlayfs).
+4. **`guess/common`**: Generic hook script executed during the `common` detection pass
+ (e.g., to detect locales, udev rules, or compression preferences).
+
+Detection scripts use shell helper functions provided by `guess-functions`:
+
+* `guess_feature <feature>`: Proposes activating a feature.
+* `guess_module [group] <module>`: Proposes adding a kernel module.
+* `guess_modalias [group] <modalias>`: Proposes resolving a modalias string.
+* `guess_variable <name> <value>`: Proposes setting a configuration variable.
diff --git a/Documentation/MakeInitrdArguments.md b/Documentation/MakeInitrdArguments.md
index 13c0b034..b8ac966c 100644
--- a/Documentation/MakeInitrdArguments.md
+++ b/Documentation/MakeInitrdArguments.md
@@ -8,6 +8,9 @@ the image.
`AUTODETECT` variable.
- **guess-modules** - This goal prints list of module needed to mount specified
mountpoint or block device.
+- **guess-explain** - This goal runs autodetection and prints a human-readable
+ provenance report detailing which modules proposed each feature, kernel driver,
+ modalias, and configuration variable.
- **bug-report** - This goal collects system configuration data and puts those
into an archive. If you have any problems with make-initrd this goal will help
to gather the information necessary for developers to diagnose and fix bugs.
@@ -15,4 +18,5 @@ the image.
## See also
- The article about [configuration](Configuration.md).
+- The article about [autodetection](GuessConfiguration.md).
- The list of [features](Features.md).
diff --git a/Documentation/NewFeature.md b/Documentation/NewFeature.md
index d9d10a55..a961c31c 100644
--- a/Documentation/NewFeature.md
+++ b/Documentation/NewFeature.md
@@ -83,6 +83,47 @@ PUT_FEATURE_PROGS += $(MDADM_PROGS)
All binary utilities will be copied along with a libraries with which they are
linked.
+### guess/
+
+The `guess/` directory contains autodetection logic for the feature. A feature can
+provide up to four types of detection scripts:
+
+* `guess/action` - The primary autodetection module. It is executed by `guess-runner`
+ when scheduled by `AUTODETECT` (or triggered by dependencies).
+* `guess/device` - Invoked by `rootfs` while traversing parent block devices in `/sys`
+ (for example, to detect stacked storage like LVM, LUKS, RAID, or bcache).
+* `guess/fstype` - Invoked by `rootfs` to identify filesystem types and propose
+ the necessary filesystem kernel modules.
+* `guess/common` - Unconditional detection hook executed during the `common` detection
+ pass (for example, to detect system locales or compression tools).
+
+Detection scripts use helper functions provided by `guess-functions`:
+
+```bash
+# Propose enabling another feature
+guess_feature lvm
+
+# Propose adding a kernel module
+guess_module scsi_mod
+guess_module rescue hid-generic
+
+# Propose a modalias to resolve to kernel drivers
+guess_modalias "pci:v000015B7d00005009sv*"
+
+# Propose a configuration variable
+guess_variable MOUNTPOINTS "/boot"
+```
+
+If a feature requires additional guess modules to be run when this feature is
+activated, declare it in `config.mk`:
+
+```make
+$(call guess-requires, lvm luks)
+```
+
+When `guess-runner` activates the feature, any required detection modules are
+automatically enqueued into subsequent detection passes.
+
### pack.mk
This file contains the targets and variables used to package the generated
diff --git a/Documentation/manpages/make-initrd.1.md b/Documentation/manpages/make-initrd.1.md
index e9542878..f54ef6c0 100644
--- a/Documentation/manpages/make-initrd.1.md
+++ b/Documentation/manpages/make-initrd.1.md
@@ -9,6 +9,7 @@ make-initrd - creates initial ramdisk images for preloading modules
*make-initrd* [<option>]++
*make-initrd* guess-modules [<device>|<directory>]++
*make-initrd* guess-config++
+*make-initrd* guess-explain++
*make-initrd* bug-report
# DESCRIPTION
@@ -26,6 +27,12 @@ Without options, the program generates images for all the configuration files.
Guesses the current configuration and generates the config file.
+*guess-explain*
+
+ Guesses the current configuration and explains the provenance of all
+ proposed features, kernel modules, modaliases, and configuration
+ variables.
+
*guess-modules* [<device>|<directory>]
Shows kernel module needed to mount specified mountpoint or block device.
diff --git a/features/modules-blockdev/README.md b/features/modules-blockdev/README.md
index b931c31d..5b886daa 100644
--- a/features/modules-blockdev/README.md
+++ b/features/modules-blockdev/README.md
@@ -3,3 +3,8 @@
Feature adds a collection of block device modules available to the kernel (pata,
sata, scsi, firewire, usb, or mmc). These modules are not determined based on
the current hardware.
+
+## Parameters
+
+- **DEVICES** -- The list of device files for which the required modules and
+ parameters are guessed.
diff --git a/features/modules-device-tree/README.md b/features/modules-device-tree/README.md
index a0833927..790c03af 100644
--- a/features/modules-device-tree/README.md
+++ b/features/modules-device-tree/README.md
@@ -1 +1,16 @@
-This feature detects and includes kernel modules for Open Firmware Device Tree peripherals.
+# Feature: modules-device-tree
+
+This feature scans the Open Firmware Device Tree [1] for compatible nodes and
+determines which kernel modules are required for the current hardware. It is
+intended to be used in embedded Linux environments where device trees are used to
+describe hardware peripherals.
+
+## Parameters
+
+You can disable autodetection for this feature by adding to `/etc/initrd.mk`:
+
+```make
+DISABLE_GUESS += device-tree
+```
+
+[1] https://www.devicetree.org/specifications/
diff --git a/features/modules-keyboard/README.md b/features/modules-keyboard/README.md
index e6ecbed4..49880ee2 100644
--- a/features/modules-keyboard/README.md
+++ b/features/modules-keyboard/README.md
@@ -1 +1,12 @@
-This feature provides kernel modules required for keyboard input.
+# Feature: modules-keyboard
+
+This feature detects and includes kernel modules required for keyboard and input
+devices (`/sys/class/input`).
+
+## Parameters
+
+You can disable autodetection for this feature by adding to `/etc/initrd.mk`:
+
+```make
+DISABLE_GUESS += keyboard
+```
diff --git a/features/modules-network/README.md b/features/modules-network/README.md
index 7077cd84..ad80d9d4 100644
--- a/features/modules-network/README.md
+++ b/features/modules-network/README.md
@@ -2,3 +2,9 @@
Feature adds a collection of network modules available to the kernel.
These modules are not determined based on the current hardware.
+
+## Parameters
+
+- **GUESS_NET_IFACE** -- The list of network interfaces (`/sys/class/net/*`) for
+ which you want to find modules. If the special word `all` is specified, then
+ there will be a search for modules for all network interfaces.
diff --git a/features/modules-touchscreen/README.md b/features/modules-touchscreen/README.md
index 480ced9f..65b2c23a 100644
--- a/features/modules-touchscreen/README.md
+++ b/features/modules-touchscreen/README.md
@@ -1 +1,15 @@
-This feature provides kernel modules required for touchscreen input.
+# Feature: modules-touchscreen
+
+This feature detects and includes kernel modules required for touchscreen
+devices.
+
+Touchscreen modules may be necessary, for example, if you need to enter a
+password to unlock an encrypted mobile device.
+
+## Parameters
+
+You can disable autodetection for this feature by adding to `/etc/initrd.mk`:
+
+```make
+DISABLE_GUESS += touchscreen
+```
diff --git a/features/resume/README.md b/features/resume/README.md
index 117b4b5c..30ce33f6 100644
--- a/features/resume/README.md
+++ b/features/resume/README.md
@@ -1 +1,13 @@
-This feature detects and handles resuming system from suspend-to-disk (hibernation).
+# Feature: resume
+
+This feature detects and handles resuming the system from suspend-to-disk
+(hibernation). It finds modules needed to access the hibernation image device,
+which is useful when the resume device is encrypted or in an unexpected location.
+
+## Parameters
+
+You can disable autodetection for this feature by adding to `/etc/initrd.mk`:
+
+```make
+DISABLE_GUESS += resume
+```
diff --git a/features/rootfs/README.md b/features/rootfs/README.md
index 00e9fb25..0edfc25f 100644
--- a/features/rootfs/README.md
+++ b/features/rootfs/README.md
@@ -15,4 +15,9 @@ from the mountpoints known to the build.
## Guess logic
The feature also adds guessing support for filesystem modules needed by the
-detected root filesystem type.
+detected root filesystem type and underlying block devices.
+
+## Parameters
+
+- **GUESS_MOUNTPOINTS** -- List of mountpoints for which required kernel modules
+ and block device drivers will be guessed.
diff --git a/utils/make-wiki.sh b/utils/make-wiki.sh
index 195111a8..991ffa5c 100755
--- a/utils/make-wiki.sh
+++ b/utils/make-wiki.sh
@@ -43,16 +43,13 @@ cp -f -- Documentation/README.md .wiki/Home.md
cp -f -- features/README.md .wiki/Features.md
echo >> .wiki/Features.md
-echo >> .wiki/GuessConfiguration.md
copy_readme features/ "Feature:" "feature-" >> .wiki/Features.md
-copy_readme guess/ "Guess module:" "guess-" >> .wiki/GuessConfiguration.md
find .wiki \
-name '*.md' \
-exec sed -r -i \
-e 's,\((\.\./)*Documentation/,(,g' \
- -e 's,\(guess/,(guess-,g' \
-e 's,\(features/,(feature-,g' \
-e 's,/README\.md\),),g' \
-e 's,\.md\),),g' \
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 8/9] guess: Cache visited sysfs device nodes during autodetection
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
` (6 preceding siblings ...)
2026-11-12 13:55 ` [make-initrd] [PATCH v1 7/9] docs: Update guess and autodetection documentation for feature-based architecture Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 9/9] guess: Add device.filter support to skip non-applicable device hooks Alexey Gladkov
2026-11-12 16:08 ` [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Anton Midyukov
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
During storage device autodetection, guess_device recursively climbs
the sysfs device hierarchy (via parent) and inspects all slaves,
suppliers, loops, and feature device hooks. When a system has multiple
mount points on the same storage device or member disks under the same
bridge (e.g. MDADM RAID, LVM), the shared parent devices and buses were
previously re-traversed and had all 12 guess/device feature hooks
re-executed from scratch for each partition or drive.
Add visited_sysfs_devices associative cache in guess-functions to
memoize canonical sysfs device paths, avoiding redundant script
invocations and sysfs walks.
Also avoid subshell pipeline in features/rootfs/guess/action when reading
mountpoint device information so that visited_sysfs_devices is preserved
across multiple mount points.
Benchmark on NVMe storage with multiple partitions:
- 2 partitions: hook executions dropped from 238 to 136
(-42.9%, 102 fewer process executions), cutting wall-clock
time from ~896 ms to ~538 ms per run (~40% speedup).
- 3 partitions: hook executions dropped from 340 to 136
(-60.0%, 204 fewer process executions).
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
.../ts0001-guess-ignore-multipath/expect | 110 ------------------
features/rootfs/guess/action | 4 +-
.../ts0068-guess-device-visited-cache/expect | 3 +
.../ts0068-guess-device-visited-cache/run | 22 ++++
tools/guess-functions | 6 +
5 files changed, 33 insertions(+), 112 deletions(-)
create mode 100644 testing/tests/ts0068-guess-device-visited-cache/expect
create mode 100755 testing/tests/ts0068-guess-device-visited-cache/run
diff --git a/features/mdadm/tests/ts0001-guess-ignore-multipath/expect b/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
index d7f0fb80..fd73b7cb 100644
--- a/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
+++ b/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
@@ -166,61 +166,6 @@ TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_de
TRACE function 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v00008086d00007AC8sv00000000sd00000000bc06sc04i00
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE function 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/..
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device modalias /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE function 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/..
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device modalias /devices/pci0000:00/0000:00:0e.0
-TRACE function 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v00008086d0000467Fsv00008086sd00000000bc01sc04i00
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00/0000:00:0e.0
-TRACE function 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:0e.0/..
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device modalias /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00
-TRACE function 9 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/..
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
@@ -314,61 +259,6 @@ TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_de
TRACE function 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v00008086d00007AC4sv00000000sd00000000bc06sc04i00
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE function 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/..
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device modalias /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE function 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/..
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device modalias /devices/pci0000:00/0000:00:0e.0
-TRACE function 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v00008086d0000467Fsv00008086sd00000000bc01sc04i00
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00/0000:00:0e.0
-TRACE function 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/0000:00:0e.0/..
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device modalias /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device parent /devices/pci0000:00
-TRACE function 9 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:00/..
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
diff --git a/features/rootfs/guess/action b/features/rootfs/guess/action
index fd0c9d3e..5fed263d 100755
--- a/features/rootfs/guess/action
+++ b/features/rootfs/guess/action
@@ -209,13 +209,13 @@ for dir in ${MOUNTPOINTS-} ${GUESS_MOUNTPOINTS-} $MORE_MOUNTPOINTS; do
out="$($_findmnt "$dir")" ||
fatal "Unable to find device for '$dir' mount point"
- printf '%s\n' "$out" |
while read -r majmin fstype device; do
+ [ -n "$majmin" ] || continue
# kernel >= 2.6.27
[ -z "${majmin##0:*}" ] ||
guess_device "/dev/block/$majmin"
guess_fstype "$device" "$fstype" "$dir"
- done
+ done <<< "$out"
guess_feature rootfs
guess_feature add-udev-rules
diff --git a/testing/tests/ts0068-guess-device-visited-cache/expect b/testing/tests/ts0068-guess-device-visited-cache/expect
new file mode 100644
index 00000000..732916a2
--- /dev/null
+++ b/testing/tests/ts0068-guess-device-visited-cache/expect
@@ -0,0 +1,3 @@
+modalias add scsi:disk - -
+modalias add pci:parent_bridge - -
+rc=0
diff --git a/testing/tests/ts0068-guess-device-visited-cache/run b/testing/tests/ts0068-guess-device-visited-cache/run
new file mode 100755
index 00000000..e083a6d1
--- /dev/null
+++ b/testing/tests/ts0068-guess-device-visited-cache/run
@@ -0,0 +1,22 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+mkdir -p "$tmpdir/guess"
+mkdir -p "$tmpdir/sys/devices/pci0000:00/0000:00:01.0/block/sda/sda1"
+mkdir -p "$tmpdir/sys/devices/pci0000:00/0000:00:01.0/block/sda/sda2"
+echo "pci:parent_bridge" > "$tmpdir/sys/devices/pci0000:00/0000:00:01.0/modalias"
+echo "scsi:disk" > "$tmpdir/sys/devices/pci0000:00/0000:00:01.0/block/sda/modalias"
+
+export PATH="$PWD/.build/dest/usr/bin:$PWD/.build/dest/usr/sbin:$PWD/tools:$PATH"
+export SYSFS_PATH="$tmpdir/sys"
+export GUESSDIR="$tmpdir/guess"
+
+. guess-functions
+
+guess_device "/devices/pci0000:00/0000:00:01.0/block/sda/sda1"
+guess_device "/devices/pci0000:00/0000:00:01.0/block/sda/sda2"
+
+cat "$GUESSDIR/guess.tsv"
diff --git a/tools/guess-functions b/tools/guess-functions
index eb63d7e1..3c8d1f88 100644
--- a/tools/guess-functions
+++ b/tools/guess-functions
@@ -110,6 +110,8 @@ guess_fstype() {
done
}
+declare -g -A visited_sysfs_devices=()
+
guess_device() {
$TRACE_ENTER "$@" || {
$TRACE_ENTER_RETCODE $?
@@ -124,6 +126,10 @@ guess_device() {
[ -z "${device_file##$SYSFS_PATH/devices/*}" ] ||
return 0
+ [ -z "${visited_sysfs_devices[$device_file]-}" ] ||
+ return 0
+ visited_sysfs_devices["$device_file"]=1
+
for m in modalias parent slaves supplier loop ${GUESS_DEVICE_SCRIPTS-}; do
$TRACE_RUN "$m" "${device_file#$SYSFS_PATH}"
done
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [make-initrd] [PATCH v1 9/9] guess: Add device.filter support to skip non-applicable device hooks
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
` (7 preceding siblings ...)
2026-11-12 13:55 ` [make-initrd] [PATCH v1 8/9] guess: Cache visited sysfs device nodes during autodetection Alexey Gladkov
@ 2026-11-12 13:55 ` Alexey Gladkov
2026-11-12 16:08 ` [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Anton Midyukov
9 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
To: make-initrd
During sysfs block device traversal in guess_device(), all registered
guess/device hooks were previously spawned as child processes for every
visited sysfs device node. Most hooks (such as devmapper, lvm, luks,
mdadm, bcache) immediately exit 0 when their respective sysfs node
(e.g., /dm, /md, /bcache) does not exist under the device path.
Introduce optional features/<name>/guess/device.filter scripts sourced
directly in the main shell. If a filter exists and its device_filter()
returns non-zero for a given sysfs device node, guess_device() skips
spawning the corresponding guess/device hook process entirely.
Benchmark results:
- features/lvm/tests/ts0001-guess-lvm:
without filters: avg 1378.8 ms (min 1350.0 ms)
with filters: avg 979.4 ms (min 966.2 ms)
~29% faster (~400 ms saved, 10 child processes skipped).
- features/mdadm/tests/ts0001-guess-ignore-multipath:
without filters: avg 5502.0 ms (min 5387.5 ms)
with filters: avg 3466.3 ms (min 3438.9 ms)
~37% faster (~2.03 s saved, 144 child processes skipped).
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
Documentation/GuessConfiguration.md | 4 +-
Documentation/NewFeature.md | 4 +-
features/bcache/guess/device | 3 -
features/bcache/guess/device.filter | 6 +
.../tests/ts0001-guess-device-light/run | 3 +-
.../ts0002-guess-device-light-no-bcache/run | 3 +-
features/clevis/guess/device | 2 -
features/clevis/guess/device.filter | 6 +
features/devmapper/guess/device | 3 -
features/devmapper/guess/device.filter | 6 +
.../tests/ts0001-guess-device-light/run | 3 +-
.../tests/ts0002-guess-device-light-no-dm/run | 3 +-
features/luks/guess/device | 3 -
features/luks/guess/device.filter | 6 +
features/lvm/guess/device | 3 -
features/lvm/guess/device.filter | 6 +
features/lvm/tests/ts0001-guess-lvm/expect | 10 --
features/mdadm/guess/device | 3 -
features/mdadm/guess/device.filter | 6 +
.../ts0001-guess-ignore-multipath/expect | 144 ------------------
features/multipath/guess/device | 3 -
features/multipath/guess/device.filter | 6 +
features/sysfs-virtio-pci/guess/device | 3 +-
features/sysfs-virtio-pci/guess/device.filter | 6 +
.../tests/ts0001-guess-device-light/run | 5 +-
.../run | 5 +-
.../tests/ts0069-guess-device-filter/expect | 2 +
testing/tests/ts0069-guess-device-filter/run | 37 +++++
tools/guess-functions | 10 ++
29 files changed, 120 insertions(+), 184 deletions(-)
create mode 100755 features/bcache/guess/device.filter
create mode 100755 features/clevis/guess/device.filter
create mode 100755 features/devmapper/guess/device.filter
create mode 100755 features/luks/guess/device.filter
create mode 100755 features/lvm/guess/device.filter
create mode 100755 features/mdadm/guess/device.filter
create mode 100755 features/multipath/guess/device.filter
create mode 100755 features/sysfs-virtio-pci/guess/device.filter
create mode 100644 testing/tests/ts0069-guess-device-filter/expect
create mode 100755 testing/tests/ts0069-guess-device-filter/run
diff --git a/Documentation/GuessConfiguration.md b/Documentation/GuessConfiguration.md
index 8b3736c0..f382fbf0 100644
--- a/Documentation/GuessConfiguration.md
+++ b/Documentation/GuessConfiguration.md
@@ -255,7 +255,9 @@ can participate in autodetection:
when the module is scheduled.
2. **`guess/device`**: Hook script invoked by `rootfs` while traversing parent devices
in the `/sys` block device hierarchy. Used to detect block layers like LVM,
- LUKS, MDADM, bcache, or devmapper.
+ LUKS, MDADM, bcache, or devmapper. An optional `guess/device.filter` script can
+ define a `device_filter` function to fast-path or skip invoking `guess/device` for
+ non-matching sysfs devices without spawning a child process.
3. **`guess/fstype`**: Hook script invoked by `rootfs` to identify filesystem types
and propose appropriate filesystem drivers (e.g. ext4, btrfs, xfs, zfs, overlayfs).
4. **`guess/common`**: Generic hook script executed during the `common` detection pass
diff --git a/Documentation/NewFeature.md b/Documentation/NewFeature.md
index a961c31c..f2aa64d2 100644
--- a/Documentation/NewFeature.md
+++ b/Documentation/NewFeature.md
@@ -91,7 +91,9 @@ provide up to four types of detection scripts:
* `guess/action` - The primary autodetection module. It is executed by `guess-runner`
when scheduled by `AUTODETECT` (or triggered by dependencies).
* `guess/device` - Invoked by `rootfs` while traversing parent block devices in `/sys`
- (for example, to detect stacked storage like LVM, LUKS, RAID, or bcache).
+ (for example, to detect stacked storage like LVM, LUKS, RAID, or bcache). Features
+ can optionally provide a lightweight `guess/device.filter` shell script containing a
+ `device_filter` function to skip invoking the hook script for non-matching sysfs devices.
* `guess/fstype` - Invoked by `rootfs` to identify filesystem types and propose
the necessary filesystem kernel modules.
* `guess/common` - Unconditional detection hook executed during the `common` detection
diff --git a/features/bcache/guess/device b/features/bcache/guess/device
index 02c27319..ed9a3809 100755
--- a/features/bcache/guess/device
+++ b/features/bcache/guess/device
@@ -1,9 +1,6 @@
#!/bin/bash -efu
# SPDX-License-Identifier: GPL-3.0-or-later
-[ -d "$SYSFS_PATH$1"/bcache ] ||
- exit 0
-
. guess-functions
guess_module bcache
diff --git a/features/bcache/guess/device.filter b/features/bcache/guess/device.filter
new file mode 100755
index 00000000..b2cf9d7d
--- /dev/null
+++ b/features/bcache/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -d "$SYSFS_PATH$1/bcache" ]
+}
diff --git a/features/bcache/tests/ts0001-guess-device-light/run b/features/bcache/tests/ts0001-guess-device-light/run
index 90bcaecb..e3498d78 100755
--- a/features/bcache/tests/ts0001-guess-device-light/run
+++ b/features/bcache/tests/ts0001-guess-device-light/run
@@ -5,8 +5,9 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-feature-sh-functions
guess_feature_test_init "$0"
+. guess-functions
mkdir -p -- "$SYSFS_PATH/devices/test-bcache/bcache"
-features/bcache/guess/device /devices/test-bcache
+GUESS_DEVICE_SCRIPTS="features/bcache/guess/device" guess_device /devices/test-bcache
guess_feature_test_dump
diff --git a/features/bcache/tests/ts0002-guess-device-light-no-bcache/run b/features/bcache/tests/ts0002-guess-device-light-no-bcache/run
index 81a935ff..03dfe15c 100755
--- a/features/bcache/tests/ts0002-guess-device-light-no-bcache/run
+++ b/features/bcache/tests/ts0002-guess-device-light-no-bcache/run
@@ -5,8 +5,9 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-feature-sh-functions
guess_feature_test_init "$0"
+. guess-functions
mkdir -p -- "$SYSFS_PATH/devices/test-bcache"
-features/bcache/guess/device /devices/test-bcache
+GUESS_DEVICE_SCRIPTS="features/bcache/guess/device" guess_device /devices/test-bcache
guess_feature_test_dump
diff --git a/features/clevis/guess/device b/features/clevis/guess/device
index dfa0aa31..61d46061 100755
--- a/features/clevis/guess/device
+++ b/features/clevis/guess/device
@@ -1,8 +1,6 @@
#!/bin/bash -efu
# SPDX-License-Identifier: GPL-3.0-or-later
-[ -d "$SYSFS_PATH$1"/dm ] || exit 0
-
. guess-functions
is_command_exist clevis || exit 0
diff --git a/features/clevis/guess/device.filter b/features/clevis/guess/device.filter
new file mode 100755
index 00000000..a8653483
--- /dev/null
+++ b/features/clevis/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -d "$SYSFS_PATH$1/dm" ]
+}
diff --git a/features/devmapper/guess/device b/features/devmapper/guess/device
index fa2e7789..785d9ac5 100755
--- a/features/devmapper/guess/device
+++ b/features/devmapper/guess/device
@@ -1,9 +1,6 @@
#!/bin/bash -efu
# SPDX-License-Identifier: GPL-3.0-or-later
-[ -d "$SYSFS_PATH$1"/dm ] ||
- exit 0
-
. guess-functions
guess_feature devmapper
diff --git a/features/devmapper/guess/device.filter b/features/devmapper/guess/device.filter
new file mode 100755
index 00000000..a8653483
--- /dev/null
+++ b/features/devmapper/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -d "$SYSFS_PATH$1/dm" ]
+}
diff --git a/features/devmapper/tests/ts0001-guess-device-light/run b/features/devmapper/tests/ts0001-guess-device-light/run
index f55e9a10..c8ba2bf9 100755
--- a/features/devmapper/tests/ts0001-guess-device-light/run
+++ b/features/devmapper/tests/ts0001-guess-device-light/run
@@ -5,8 +5,9 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-feature-sh-functions
guess_feature_test_init "$0"
+. guess-functions
mkdir -p -- "$SYSFS_PATH/devices/test-dm/dm"
-features/devmapper/guess/device /devices/test-dm
+GUESS_DEVICE_SCRIPTS="features/devmapper/guess/device" guess_device /devices/test-dm
guess_feature_test_dump
diff --git a/features/devmapper/tests/ts0002-guess-device-light-no-dm/run b/features/devmapper/tests/ts0002-guess-device-light-no-dm/run
index 879c3a2a..0be9ac2c 100755
--- a/features/devmapper/tests/ts0002-guess-device-light-no-dm/run
+++ b/features/devmapper/tests/ts0002-guess-device-light-no-dm/run
@@ -5,8 +5,9 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-feature-sh-functions
guess_feature_test_init "$0"
+. guess-functions
mkdir -p -- "$SYSFS_PATH/devices/test-dm"
-features/devmapper/guess/device /devices/test-dm
+GUESS_DEVICE_SCRIPTS="features/devmapper/guess/device" guess_device /devices/test-dm
guess_feature_test_dump
diff --git a/features/luks/guess/device b/features/luks/guess/device
index 84f42fc0..bee5d012 100755
--- a/features/luks/guess/device
+++ b/features/luks/guess/device
@@ -1,9 +1,6 @@
#!/bin/bash -efu
# SPDX-License-Identifier: GPL-3.0-or-later
-[ -d "$SYSFS_PATH$1"/dm ] ||
- exit 0
-
. guess-functions
uuid=
diff --git a/features/luks/guess/device.filter b/features/luks/guess/device.filter
new file mode 100755
index 00000000..a8653483
--- /dev/null
+++ b/features/luks/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -d "$SYSFS_PATH$1/dm" ]
+}
diff --git a/features/lvm/guess/device b/features/lvm/guess/device
index b2c195c2..596b4a58 100755
--- a/features/lvm/guess/device
+++ b/features/lvm/guess/device
@@ -1,9 +1,6 @@
#!/bin/bash -efu
# SPDX-License-Identifier: GPL-3.0-or-later
-[ -d "$SYSFS_PATH$1"/dm ] ||
- exit 0
-
. guess-functions
uuid=
diff --git a/features/lvm/guess/device.filter b/features/lvm/guess/device.filter
new file mode 100755
index 00000000..a8653483
--- /dev/null
+++ b/features/lvm/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -d "$SYSFS_PATH$1/dm" ]
+}
diff --git a/features/lvm/tests/ts0001-guess-lvm/expect b/features/lvm/tests/ts0001-guess-lvm/expect
index 19a3483b..f6467192 100644
--- a/features/lvm/tests/ts0001-guess-lvm/expect
+++ b/features/lvm/tests/ts0001-guess-lvm/expect
@@ -4,8 +4,6 @@ TRACE function 1 features/rootfs/guess/action main guess_device guess_device /d
TRACE function 2 features/rootfs/guess/action main guess_device guess_device guess_device /devices/virtual/block/dm-0/..
TRACE function 3 features/rootfs/guess/action main guess_device guess_device guess_device guess_device /devices/virtual/block/..
TRACE function 4 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device /devices/virtual/..
-TRACE run 3 features/rootfs/guess/action main guess_device guess_device guess_device features/lvm/guess/device /devices/virtual
-TRACE run 2 features/rootfs/guess/action main guess_device guess_device features/lvm/guess/device /devices/virtual/block
TRACE function 2 features/rootfs/guess/action main guess_device guess_device guess_device /devices/virtual/block/dm-0/slaves/sda3
TRACE function 3 features/rootfs/guess/action main guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/sda3/..
TRACE function 4 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/..
@@ -17,14 +15,6 @@ TRACE function 8 features/rootfs/guess/action main guess_device guess_device gu
TRACE function 9 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_modalias guess_modalias pci:v000015ADd000007C0sv000015ADsd000007C0bc01sc07i00
TRACE function 9 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/0000:02:00.0/..
TRACE function 10 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device /devices/pci0000:02/..
-TRACE run 9 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02
-TRACE run 8 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0
-TRACE run 7 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2
-TRACE run 6 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0
-TRACE run 5 features/rootfs/guess/action main guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0
-TRACE run 4 features/rootfs/guess/action main guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block
-TRACE run 3 features/rootfs/guess/action main guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda
-TRACE run 2 features/rootfs/guess/action main guess_device guess_device features/lvm/guess/device /devices/pci0000:02/0000:02:00.0/host2/target2:0:0/2:0:0:0/block/sda/sda3
TRACE run 1 features/rootfs/guess/action main guess_device features/lvm/guess/device /devices/virtual/block/dm-0
TRACE function 1 features/lvm/guess/device main guess_feature guess_feature lvm
TRACE function 1 features/rootfs/guess/action main guess_fstype guess_fstype /dev/mapper/ubuntu--vg-ubuntu--lv ext4 /
diff --git a/features/mdadm/guess/device b/features/mdadm/guess/device
index d5dbc0da..4b3d6411 100755
--- a/features/mdadm/guess/device
+++ b/features/mdadm/guess/device
@@ -1,9 +1,6 @@
#!/bin/bash -eu
# SPDX-License-Identifier: GPL-3.0-or-later
-[ -d "$SYSFS_PATH$1"/md ] ||
- exit 0
-
. guess-functions
level=
diff --git a/features/mdadm/guess/device.filter b/features/mdadm/guess/device.filter
new file mode 100755
index 00000000..c11ace22
--- /dev/null
+++ b/features/mdadm/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -d "$SYSFS_PATH$1/md" ]
+}
diff --git a/features/mdadm/tests/ts0001-guess-ignore-multipath/expect b/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
index fd73b7cb..df0506b3 100644
--- a/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
+++ b/features/mdadm/tests/ts0001-guess-ignore-multipath/expect
@@ -31,122 +31,58 @@ TRACE function 9 features/mdadm/guess/device main guess_device guess_device gue
TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00
TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00
TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00
TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00
TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00
TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00
-TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00
TRACE run 8 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00
TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0
TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0
TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0
TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0
TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0
TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0
-TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0
TRACE run 7 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0
TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
-TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 6 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme
TRACE run 2 features/mdadm/guess/device main guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
TRACE run 2 features/mdadm/guess/device main guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
TRACE run 2 features/mdadm/guess/device main guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0
TRACE run 1 features/mdadm/guess/device main guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
TRACE run 1 features/mdadm/guess/device main guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
TRACE run 1 features/mdadm/guess/device main guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
TRACE run 1 features/mdadm/guess/device main guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
TRACE run 1 features/mdadm/guess/device main guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
TRACE run 1 features/mdadm/guess/device main guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
TRACE run 1 features/mdadm/guess/device main guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0/nvme0n1
TRACE function 1 features/mdadm/guess/device main guess_device guess_device /devices/virtual/block/md126/md/dev-nvme1n1/block
TRACE run 1 features/mdadm/guess/device main guess_device modalias /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
@@ -169,77 +105,37 @@ TRACE function 6 features/mdadm/guess/device main guess_device guess_device gue
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme
TRACE run 2 features/mdadm/guess/device main guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
TRACE run 2 features/mdadm/guess/device main guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
TRACE run 2 features/mdadm/guess/device main guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1
TRACE run 1 features/mdadm/guess/device main guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
TRACE run 1 features/mdadm/guess/device main guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
TRACE run 1 features/mdadm/guess/device main guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
TRACE run 1 features/mdadm/guess/device main guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
TRACE run 1 features/mdadm/guess/device main guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
TRACE run 1 features/mdadm/guess/device main guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
TRACE run 1 features/mdadm/guess/device main guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1a.0/10000:e2:00.0/nvme/nvme1/nvme1n1
TRACE function 1 features/mdadm/guess/device main guess_device guess_device /devices/virtual/block/md126/md/dev-nvme2n1/block
TRACE run 1 features/mdadm/guess/device main guess_device modalias /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
@@ -262,77 +158,37 @@ TRACE function 6 features/mdadm/guess/device main guess_device guess_device gue
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
-TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 5 features/mdadm/guess/device main guess_device guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
-TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
TRACE run 4 features/mdadm/guess/device main guess_device guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
-TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
TRACE run 3 features/mdadm/guess/device main guess_device guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme
TRACE run 2 features/mdadm/guess/device main guess_device guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
TRACE run 2 features/mdadm/guess/device main guess_device guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
TRACE run 2 features/mdadm/guess/device main guess_device guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
-TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
TRACE run 2 features/mdadm/guess/device main guess_device guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2
TRACE run 1 features/mdadm/guess/device main guess_device slaves /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
TRACE run 1 features/mdadm/guess/device main guess_device supplier /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
TRACE run 1 features/mdadm/guess/device main guess_device loop /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/bcache/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/clevis/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/devmapper/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/luks/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/lvm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/mdadm/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/multipath/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
TRACE run 1 features/mdadm/guess/device main guess_device features/nvmf/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
TRACE run 1 features/mdadm/guess/device main guess_device features/scsi-mode/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
TRACE run 1 features/mdadm/guess/device main guess_device features/sysfs-dma/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
-TRACE run 1 features/mdadm/guess/device main guess_device features/sysfs-virtio-pci/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
TRACE run 1 features/mdadm/guess/device main guess_device features/usb-storage/guess/device /devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:1b.4/10000:e3:00.0/nvme/nvme2/nvme2n1
TRACE function 1 features/mdadm/guess/device main guess_modalias guess_modalias md-raid0
TRACE function 1 features/mdadm/guess/device main guess_modalias guess_modalias efivarfs
diff --git a/features/multipath/guess/device b/features/multipath/guess/device
index 84841bef..61ba3c26 100755
--- a/features/multipath/guess/device
+++ b/features/multipath/guess/device
@@ -1,9 +1,6 @@
#!/bin/bash -efu
# SPDX-License-Identifier: GPL-3.0-or-later
-[ -d "$SYSFS_PATH$1"/dm ] ||
- exit 0
-
. guess-functions
uuid=
diff --git a/features/multipath/guess/device.filter b/features/multipath/guess/device.filter
new file mode 100755
index 00000000..a8653483
--- /dev/null
+++ b/features/multipath/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -d "$SYSFS_PATH$1/dm" ]
+}
diff --git a/features/sysfs-virtio-pci/guess/device b/features/sysfs-virtio-pci/guess/device
index c4e3e617..5301f2df 100755
--- a/features/sysfs-virtio-pci/guess/device
+++ b/features/sysfs-virtio-pci/guess/device
@@ -3,5 +3,4 @@
. guess-functions
-[ -n "${1##/devices/virtio-pci}" ] ||
- guess_module virtio_pci
+guess_module virtio_pci
diff --git a/features/sysfs-virtio-pci/guess/device.filter b/features/sysfs-virtio-pci/guess/device.filter
new file mode 100755
index 00000000..77222013
--- /dev/null
+++ b/features/sysfs-virtio-pci/guess/device.filter
@@ -0,0 +1,6 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+device_filter() {
+ [ -z "${1##/devices/virtio-pci}" ]
+}
diff --git a/features/sysfs-virtio-pci/tests/ts0001-guess-device-light/run b/features/sysfs-virtio-pci/tests/ts0001-guess-device-light/run
index 32ceb1a1..801b4679 100755
--- a/features/sysfs-virtio-pci/tests/ts0001-guess-device-light/run
+++ b/features/sysfs-virtio-pci/tests/ts0001-guess-device-light/run
@@ -5,6 +5,9 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-feature-sh-functions
guess_feature_test_init "$0"
+. guess-functions
-features/sysfs-virtio-pci/guess/device /devices/virtio-pci
+mkdir -p -- "$SYSFS_PATH/devices/virtio-pci"
+
+GUESS_DEVICE_SCRIPTS="features/sysfs-virtio-pci/guess/device" guess_device /devices/virtio-pci
guess_feature_test_dump
diff --git a/features/sysfs-virtio-pci/tests/ts0002-guess-device-light-non-virtio-pci/run b/features/sysfs-virtio-pci/tests/ts0002-guess-device-light-non-virtio-pci/run
index 8c90229d..a646222a 100755
--- a/features/sysfs-virtio-pci/tests/ts0002-guess-device-light-non-virtio-pci/run
+++ b/features/sysfs-virtio-pci/tests/ts0002-guess-device-light-non-virtio-pci/run
@@ -5,6 +5,9 @@ cwd="${0%/*}"
. "$cwd"/../../../../testing/tests/guess-feature-sh-functions
guess_feature_test_init "$0"
+. guess-functions
-features/sysfs-virtio-pci/guess/device /devices/pci0000:00
+mkdir -p -- "$SYSFS_PATH/devices/pci0000:00"
+
+GUESS_DEVICE_SCRIPTS="features/sysfs-virtio-pci/guess/device" guess_device /devices/pci0000:00
guess_feature_test_dump
diff --git a/testing/tests/ts0069-guess-device-filter/expect b/testing/tests/ts0069-guess-device-filter/expect
new file mode 100644
index 00000000..4cee93d9
--- /dev/null
+++ b/testing/tests/ts0069-guess-device-filter/expect
@@ -0,0 +1,2 @@
+HOOK_CALLED: /devices/virtual/block/dev2
+rc=0
diff --git a/testing/tests/ts0069-guess-device-filter/run b/testing/tests/ts0069-guess-device-filter/run
new file mode 100755
index 00000000..d6601e7b
--- /dev/null
+++ b/testing/tests/ts0069-guess-device-filter/run
@@ -0,0 +1,37 @@
+#!/bin/bash -efu
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+mkdir -p "$tmpdir/guess"
+mkdir -p "$tmpdir/sys/devices/virtual/block/dev1"
+mkdir -p "$tmpdir/sys/devices/virtual/block/dev2/magic"
+
+cat << "EOF" > "$tmpdir/test-hook"
+#!/bin/bash -efu
+echo "HOOK_CALLED: $1" >> "$GUESSDIR/test.log"
+EOF
+chmod 755 "$tmpdir/test-hook"
+
+cat << "EOF" > "$tmpdir/test-hook.filter"
+#!/bin/bash -efu
+device_filter() {
+ [ -d "$SYSFS_PATH$1/magic" ]
+}
+EOF
+chmod 755 "$tmpdir/test-hook.filter"
+
+export PATH="$PWD/.build/dest/usr/bin:$PWD/.build/dest/usr/sbin:$PWD/tools:$PATH"
+export SYSFS_PATH="$tmpdir/sys"
+export GUESSDIR="$tmpdir/guess"
+export GUESS_DEVICE_SCRIPTS="$tmpdir/test-hook"
+
+. guess-functions
+
+guess_device "/devices/virtual/block/dev1"
+guess_device "/devices/virtual/block/dev2"
+
+if [ -f "$GUESSDIR/test.log" ]; then
+ cat "$GUESSDIR/test.log"
+fi
diff --git a/tools/guess-functions b/tools/guess-functions
index 3c8d1f88..36aac71d 100644
--- a/tools/guess-functions
+++ b/tools/guess-functions
@@ -112,6 +112,12 @@ guess_fstype() {
declare -g -A visited_sysfs_devices=()
+guess_device_filter() {
+ . "$1"
+ shift
+ device_filter "$@"
+}
+
guess_device() {
$TRACE_ENTER "$@" || {
$TRACE_ENTER_RETCODE $?
@@ -131,6 +137,10 @@ guess_device() {
visited_sysfs_devices["$device_file"]=1
for m in modalias parent slaves supplier loop ${GUESS_DEVICE_SCRIPTS-}; do
+ if [ -f "$m.filter" ]; then
+ guess_device_filter "$m.filter" "${device_file#$SYSFS_PATH}" ||
+ continue
+ fi
$TRACE_RUN "$m" "${device_file#$SYSFS_PATH}"
done
}
--
2.56.0
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
` (8 preceding siblings ...)
2026-11-12 13:55 ` [make-initrd] [PATCH v1 9/9] guess: Add device.filter support to skip non-applicable device hooks Alexey Gladkov
@ 2026-11-12 16:08 ` Anton Midyukov
2026-11-16 4:09 ` Anton Midyukov
9 siblings, 1 reply; 13+ messages in thread
From: Anton Midyukov @ 2026-11-12 16:08 UTC (permalink / raw)
To: Alexey Gladkov, make-initrd
12.11.2026 16:55, Alexey Gladkov пишет:
> Привет!
>
> Давним пунктом в моём todo было устранение архитектурного артифакта в guess и
> features. Когда я писал код изначально, то идея была в том, что система была
> разделена на две части: фичи, которые привносисли функционал и guess-модули,
> которые определяли необходимость тех или иных фич и добавляли их и модули ядра,
> если нужно. Структурно guess и features имели одинаковую структуру (config.mk,
> rules.mk), но были полностью независимыми.
>
> Со временем, для features потребовался детект и автоматическое добавление. У
> фичей стали появляться соответствующие части в guess/ диретории. Сейчас уже
> в guess/ всего несколько модулей без однозначной ответой части в features/.
>
> По сути детект давно перестал работать по независимым модулям и всегда привязан
> к фичам. А разделение на guess/ и features/ создаёт архитектурные трудности
> детекта конфигурации.
>
> Этот патчет устраняет архитектурное разделение на guess/ и features/. Весь
> детект привязан к фичам. Работа всё также разделена на два этапа (детект
> конфигурации и создание образа), но нет отдельного типа модулей.
>
> Я постарался оставить полную совместимость со старой схемой и модули в guess/
> должны работать. Также должны продолжать работать переменные AUTODETECT и
> DISABLE_GUESS.
>
> Я не ожидаю, что кто-то захочет действительно ревьювить эти патчи. Я отправляю
> их в рассылку, чтобы было удобнее сохранить и приложить измененеия.
>
>
> Антон, поскольку этот патчсет может тебя затронуть напрямую, то я был бы
> признателен за тестирование.
>
Хорошо, на выходных проверю.
--
best regards, Anton Midyukov <antohami@altlinux.org>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features
2026-11-12 16:08 ` [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Anton Midyukov
@ 2026-11-16 4:09 ` Anton Midyukov
2026-11-16 11:03 ` Alexey Gladkov
0 siblings, 1 reply; 13+ messages in thread
From: Anton Midyukov @ 2026-11-16 4:09 UTC (permalink / raw)
To: Alexey Gladkov, make-initrd
12.11.2026 19:08, Anton Midyukov пишет:
> 12.11.2026 16:55, Alexey Gladkov пишет:
>> Привет!
>>
>> Давним пунктом в моём todo было устранение архитектурного артифакта в guess и
>> features. Когда я писал код изначально, то идея была в том, что система была
>> разделена на две части: фичи, которые привносисли функционал и guess-модули,
>> которые определяли необходимость тех или иных фич и добавляли их и модули ядра,
>> если нужно. Структурно guess и features имели одинаковую структуру (config.mk,
>> rules.mk), но были полностью независимыми.
>>
>> Со временем, для features потребовался детект и автоматическое добавление. У
>> фичей стали появляться соответствующие части в guess/ диретории. Сейчас уже
>> в guess/ всего несколько модулей без однозначной ответой части в features/.
>>
>> По сути детект давно перестал работать по независимым модулям и всегда привязан
>> к фичам. А разделение на guess/ и features/ создаёт архитектурные трудности
>> детекта конфигурации.
>>
>> Этот патчет устраняет архитектурное разделение на guess/ и features/. Весь
>> детект привязан к фичам. Работа всё также разделена на два этапа (детект
>> конфигурации и создание образа), но нет отдельного типа модулей.
>>
>> Я постарался оставить полную совместимость со старой схемой и модули в guess/
>> должны работать. Также должны продолжать работать переменные AUTODETECT и
>> DISABLE_GUESS.
>>
>> Я не ожидаю, что кто-то захочет действительно ревьювить эти патчи. Я отправляю
>> их в рассылку, чтобы было удобнее сохранить и приложить измененеия.
>>
>>
>> Антон, поскольку этот патчсет может тебя затронуть напрямую, то я был бы
>> признателен за тестирование.
>>
>
> Хорошо, на выходных проверю.
>
В базовых сценариях использования проблем не обнаружил.
--
best regards, Anton Midyukov <antohami@altlinux.org>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features
2026-11-16 4:09 ` Anton Midyukov
@ 2026-11-16 11:03 ` Alexey Gladkov
0 siblings, 0 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-16 11:03 UTC (permalink / raw)
To: Anton Midyukov; +Cc: make-initrd
On Mon, Nov 16, 2026 at 07:09:36AM +0300, Anton Midyukov wrote:
> 12.11.2026 19:08, Anton Midyukov пишет:
> > 12.11.2026 16:55, Alexey Gladkov пишет:
> >> Привет!
> >>
> >> Давним пунктом в моём todo было устранение архитектурного артифакта в guess и
> >> features. Когда я писал код изначально, то идея была в том, что система была
> >> разделена на две части: фичи, которые привносисли функционал и guess-модули,
> >> которые определяли необходимость тех или иных фич и добавляли их и модули ядра,
> >> если нужно. Структурно guess и features имели одинаковую структуру (config.mk,
> >> rules.mk), но были полностью независимыми.
> >>
> >> Со временем, для features потребовался детект и автоматическое добавление. У
> >> фичей стали появляться соответствующие части в guess/ диретории. Сейчас уже
> >> в guess/ всего несколько модулей без однозначной ответой части в features/.
> >>
> >> По сути детект давно перестал работать по независимым модулям и всегда привязан
> >> к фичам. А разделение на guess/ и features/ создаёт архитектурные трудности
> >> детекта конфигурации.
> >>
> >> Этот патчет устраняет архитектурное разделение на guess/ и features/. Весь
> >> детект привязан к фичам. Работа всё также разделена на два этапа (детект
> >> конфигурации и создание образа), но нет отдельного типа модулей.
> >>
> >> Я постарался оставить полную совместимость со старой схемой и модули в guess/
> >> должны работать. Также должны продолжать работать переменные AUTODETECT и
> >> DISABLE_GUESS.
> >>
> >> Я не ожидаю, что кто-то захочет действительно ревьювить эти патчи. Я отправляю
> >> их в рассылку, чтобы было удобнее сохранить и приложить измененеия.
> >>
> >>
> >> Антон, поскольку этот патчсет может тебя затронуть напрямую, то я был бы
> >> признателен за тестирование.
> >>
> >
> > Хорошо, на выходных проверю.
> >
>
> В базовых сценариях использования проблем не обнаружил.
Спасибо тебе большое за помощь.
Забрал в master.
--
Rgrds, legion
^ permalink raw reply [flat|nested] 13+ messages in thread