From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794491854; x=1795096654; darn=lists.altlinux.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ng+ovporZ/2G9vXqxlc7qAW2qP1cKt0uS3K5whO795E=; b=DyeBMhjf1fT8M2KKbcDgPMY04tfyTBgM5fQaka7VjTlaZRUWokwfMj+SZXbbPl2CwS Ehv6eqpqFjZIOq4ZpSMc4c6LF+lGyVgURW+dtHTWRfJZSdfZZOpnMrus6Lx2XQz0q456 dl9QYc/Ev1WVwcdbA3c5sLtHgnxmr4wB0UT2Dmkmr2ALo/EKCVCXr6rPJesaThZDpfVK ch1+xSExqq5ih5nrl85Zs2bEfRx4n3Vzq2qHUw2mUSw0D9HPP7ycOMTyHjge5saELaDb vf4vGQl3DikUkQ0UR33HmHk5YObb7KK/oM4trTbm945WpPUhjufsEbKH2w/owLWBAmCq /gSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794491854; x=1795096654; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=ng+ovporZ/2G9vXqxlc7qAW2qP1cKt0uS3K5whO795E=; b=n4E/9E4m1hXzveH36g5JLapHoQU/11ZQjc829fLF7jMywrU8DlIQm+9dXRp52zFG++ 7hp6pR7unBHJnBqbdE3Og6Jxq0vS/LW/0gQ4V0jdeYwLyUn5BJy6r63zJquvk+H7lH0N gG/eqXCrzGxzLAp0eEReP8MEVWkRy3PuBp2GF/HKXG0EQ1ktCjYbMoMtKuIwu8zcHtr+ W7Bbrw6BtTUic0eIh7hAbOThIpoE1YMdsjLM6138z6oN/wO04/BYI4tHJhaUgL3n0iBZ YcoDXo8bMhihBrhfYZudHCADHW1zpOwy9Pi34xkXsBQxibMDuOANrCnNPQpqZbaN5WTP X/kg== X-Gm-Message-State: APuU4Z9UuURwD+/6BEjzijIp/kovY4v6SNDGVQ2hEdR5uv8BeolY51Ml FWz/OlYvpYmtTGkq6qpPM7sJnXTaXL+BgI2Zt0O5IWYxz4xGG80c4unBSlN4bg== X-Gm-Gg: AYBFou1rTtv24Fn0bZTp8uvgYnNSXJ0dxw7ihxHysQAido3kbSbBXy3CJuD1OJKUSPo 97ZDH38ftVSqZepw1yDHwoGrSf+UAXQIJHF+Xfm2xBrEzdV5F/S4R+YsT+Xx+9ODMc5CMIcHYJQ IRZHxvqV/N4tlcsr+UCR4x02NJVzo6fIM5oslpSoTCjO6LmEauEutjMmUr5BsgJyw62a/iPNp9k +f8DEvwjdSh/0TQuqNlYiPsyKittvgiNi0h0I+nuCjOLwMPljiC8H5YDIkOtHKVTh+wZOqJJzQf 5Sv270+Y9xye5vKLR0CZljgnNSrBATf7Fp+pCI9H9ZE1h6huxftildq2nk2wa/bwE3SmBTPDNDU YLOHO0WyNhkbpTb5yYMz3mTAYJ3LUkyl/i7/Xb3RTU6KaJTsuNI2JTng6oRJ+yjJVDiB6IUKPA5 6w5bnfoZ7cvTf+aRJDcsJjwxPVqKMA21UxQpcz0YTnKNs56rzQFoD7AAKI75E0u5C0HWqpaiiDW B3SR/kx/uWj9eUn4RzwXibRSKcHQ2FeIWXHFaDc/scbT6wUm6iZ+WUwJRmNbA4sPLqWWSMkGXZO IHUPEmU9D9P8/5QX/Wgl+Ll9wWsuMIiNTmTotOenWwWtrWeJA+R7haW0hfmh5+yl/zK1m6tpJfH xOd+tBaM= X-Received: by 2002:a05:600c:1d03:b0:4b7:6b96:e431 with SMTP id 5b1f17b1804b1-4ba09399711mr117222895e9.28.1794491853910; Thu, 12 Nov 2026 05:57:33 -0800 (PST) From: Alexey Gladkov To: make-initrd@lists.altlinux.org Date: Thu, 12 Nov 2026 14:55:00 +0100 Message-ID: X-Mailer: git-send-email 2.56.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features X-BeenThere: make-initrd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: make-initrd@lists.altlinux.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2026 13:57:38 -0000 Archived-At: List-Archive: Привет! Давним пунктом в моём todo было устранение архитектурного артифакта в guess и features. Когда я писал код изначально, то идея была в том, что система была разделена на две части: фичи, которые привносисли функционал и guess-модули, которые определяли необходимость тех или иных фич и добавляли их и модули ядра, если нужно. Структурно guess и features имели одинаковую структуру (config.mk, rules.mk), но были полностью независимыми. Со временем, для features потребовался детект и автоматическое добавление. У фичей стали появляться соответствующие части в guess/ диретории. Сейчас уже в guess/ всего несколько модулей без однозначной ответой части в features/. По сути детект давно перестал работать по независимым модулям и всегда привязан к фичам. А разделение на guess/ и features/ создаёт архитектурные трудности детекта конфигурации. Этот патчет устраняет архитектурное разделение на guess/ и features/. Весь детект привязан к фичам. Работа всё также разделена на два этапа (детект конфигурации и создание образа), но нет отдельного типа модулей. Я постарался оставить полную совместимость со старой схемой и модули в guess/ должны работать. Также должны продолжать работать переменные AUTODETECT и DISABLE_GUESS. Я не ожидаю, что кто-то захочет действительно ревьювить эти патчи. Я отправляю их в рассылку, чтобы было удобнее сохранить и приложить измененеия. Антон, поскольку этот патчсет может тебя затронуть напрямую, то я был бы признателен за тестирование. Link: https://github.com/osboot/make-initrd/tree/guess-refactoring-v1 Alexey Gladkov (9): mk: Introduce guess-requires primitive for feature-triggered guess modules guess: Unify internal state with structured guess.tsv logging guess: Replace recursive Make loop with bash guess-runner guess: Add guess-explain tool and CLI subcommand for config provenance guess: Convert built-in guess modules into feature guess actions guess: Remove legacy guess/root and update test fixtures to features/rootfs docs: Update guess and autodetection documentation for feature-based architecture guess: Cache visited sysfs device nodes during autodetection guess: Add device.filter support to skip non-applicable device hooks Documentation/Configuration.md | 13 +- Documentation/GuessConfiguration.md | 161 ++++++++-- Documentation/MakeInitrdArguments.md | 4 + Documentation/NewFeature.md | 43 +++ Documentation/manpages/make-initrd.1.md | 7 + Makefile.in | 20 +- .../acpica => features/acpica/guess}/action | 0 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 +- .../bootconfig/guess}/action | 0 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 +- {guess/lkrg => features/lkrg/guess}/action | 0 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 | 54 ++-- features/lvm/tests/ts0001-guess-lvm/run | 4 +- features/mdadm/guess/device | 3 - features/mdadm/guess/device.filter | 6 + .../ts0001-guess-ignore-multipath/expect | 256 +--------------- .../tests/ts0001-guess-ignore-multipath/run | 2 +- features/modules-blockdev/README.md | 5 + features/modules-blockdev/config.mk | 2 + .../modules-blockdev/guess}/action | 0 features/modules-device-tree/README.md | 16 + .../modules-device-tree}/config.mk | 1 + .../modules-device-tree/guess}/action | 0 .../modules-device-tree/rules.mk | 1 - features/modules-keyboard/README.md | 12 + .../modules-keyboard}/config.mk | 2 + .../modules-keyboard/guess}/action | 2 +- features/modules-keyboard/rules.mk | 2 + features/modules-network/README.md | 6 + features/modules-network/config.mk | 2 + .../modules-network/guess}/action | 0 features/modules-touchscreen/README.md | 15 + .../config.mk | 0 .../modules-touchscreen/guess}/action | 0 .../modules-touchscreen/rules.mk | 1 - features/multipath/guess/device | 3 - features/multipath/guess/device.filter | 6 + .../tests/ts0001-guess-overlayfs/expect | 2 +- {guess/qemu => features/qemu/guess}/action | 0 .../rdshell => features/rdshell/guess}/action | 0 features/resume/README.md | 13 + {guess/root => features/resume}/config.mk | 2 +- .../resume => features/resume/guess}/action | 3 + .../config.mk => features/resume/rules.mk | 1 - features/rootfs/README.md | 7 +- {guess/root => features/rootfs/guess}/action | 4 +- .../rootfs/tests/ts0001-guess-rootfs/expect | 34 +-- features/rootfs/tests/ts0001-guess-rootfs/run | 4 +- .../smart-card/guess}/action | 0 features/sshfsroot/config.mk | 1 + features/sysfs-virtio-pci/guess/device | 3 +- features/sysfs-virtio-pci/guess/device.filter | 6 + .../tests/ts0001-guess-device-light/run | 5 +- .../run | 5 +- {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/config.mk | 8 - 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/README.md | 9 - guess/root/rules.mk | 9 - guess/smart-card/README.md | 3 - guess/smart-card/config.mk | 4 - 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/functions.mk.in | 15 + mk/guess.mk.in | 63 ++-- mk/main.mk.in | 16 +- testing/bugreport-coverage | 6 +- testing/create-guess-test | 10 +- testing/orchestrator.py | 16 +- testing/tests/guess-feature-sh-functions | 53 ++++ testing/tests/guess-rootfs-sh-functions | 4 +- testing/tests/ts0060-guess-config/run | 14 +- testing/tests/ts0062-guess-config-tsv/run | 14 +- testing/tests/ts0065-guess-explain/expect | 23 ++ testing/tests/ts0065-guess-explain/run | 22 ++ testing/tests/ts0066-guess-runner/expect | 5 + testing/tests/ts0066-guess-runner/run | 43 +++ .../ts0067-guess-autodetect-aliases/expect | 4 + .../tests/ts0067-guess-autodetect-aliases/run | 46 +++ .../ts0068-guess-device-visited-cache/expect | 3 + .../ts0068-guess-device-visited-cache/run | 22 ++ .../tests/ts0069-guess-device-filter/expect | 2 + testing/tests/ts0069-guess-device-filter/run | 37 +++ tools/guess-config | 284 ++++++++---------- tools/guess-explain | 110 +++++++ tools/guess-functions | 49 ++- tools/guess-runner | 257 ++++++++++++++++ utils/make-initrd/make-initrd.in | 6 +- utils/make-wiki.sh | 6 +- 126 files changed, 1315 insertions(+), 851 deletions(-) rename {guess/acpica => features/acpica/guess}/action (100%) create mode 100755 features/bcache/guess/device.filter rename {guess/bootconfig => features/bootconfig/guess}/action (100%) create mode 100755 features/clevis/guess/device.filter create mode 100755 features/devmapper/guess/device.filter rename {guess/lkrg => features/lkrg/guess}/action (100%) create mode 100755 features/luks/guess/device.filter create mode 100755 features/lvm/guess/device.filter create mode 100755 features/mdadm/guess/device.filter 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/root/config.mk => features/modules-device-tree/rules.mk (67%) 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 (97%) 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/root/config.mk => features/modules-touchscreen/rules.mk (67%) create mode 100755 features/multipath/guess/device.filter rename {guess/qemu => features/qemu/guess}/action (100%) rename {guess/rdshell => features/rdshell/guess}/action (100%) create mode 100644 features/resume/README.md copy {guess/root => features/resume}/config.mk (57%) rename {guess/resume => features/resume/guess}/action (95%) rename guess/root/config.mk => features/resume/rules.mk (67%) rename {guess/root => features/rootfs/guess}/action (98%) rename {guess/smart-card => features/smart-card/guess}/action (100%) create mode 100755 features/sysfs-virtio-pci/guess/device.filter 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/config.mk 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 delete mode 100644 guess/root/README.md delete mode 100644 guess/root/rules.mk delete mode 100644 guess/smart-card/README.md delete mode 100644 guess/smart-card/config.mk 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/ts0065-guess-explain/expect create mode 100755 testing/tests/ts0065-guess-explain/run create mode 100644 testing/tests/ts0066-guess-runner/expect create mode 100755 testing/tests/ts0066-guess-runner/run create mode 100644 testing/tests/ts0067-guess-autodetect-aliases/expect create mode 100755 testing/tests/ts0067-guess-autodetect-aliases/run create mode 100644 testing/tests/ts0068-guess-device-visited-cache/expect create mode 100755 testing/tests/ts0068-guess-device-visited-cache/run create mode 100644 testing/tests/ts0069-guess-device-filter/expect create mode 100755 testing/tests/ts0069-guess-device-filter/run create mode 100755 tools/guess-explain create mode 100755 tools/guess-runner -- 2.56.0