Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the qubes-pciback module omittable #178

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

Ofenhed
Copy link

@Ofenhed Ofenhed commented Jan 10, 2025

On my system I have an alternative solution to qubes-pciback, which allows fido2 disk crypto (and fixes a hardware specific issue QubesOS/qubes-issues#8794). Unfortunately it's not compatible with qubes-pciback.

The problem I'm having with qubes-pciback is that it's included twice into dracut:

  1. It's activated by default (by not having a check() function in module-setup.sh, which defaults to include by default).
  2. It's explicitly added through dracut.conf.d/30-qubes.conf.

The check() function can be overridden using omit_dracutmodules+=, but add_dracutmodules+= can't. Since 30-qubes.conf is managed by dnf/rpm, changes to it are volatile, meaning that any setup which requires qubes-pciback to be disabled breaks whenever qubes-core-dom0-admin is updated.

This pull request removes qubes-pciback from 30-qubes.conf and adds an explicit check() function to the module which includes qubes-pciback by default. As far as I can tell from my testing and from the documentation, this will retain the exact previous behavior unless the user adds omit_dracutmodules+=" qubes-pciback " to a dracut config file.

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.03%. Comparing base (7301b1c) to head (4acff9f).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #178   +/-   ##
=======================================
  Coverage   73.03%   73.03%           
=======================================
  Files          10       10           
  Lines        1157     1157           
=======================================
  Hits          845      845           
  Misses        312      312           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@qubesos-bot
Copy link

qubesos-bot commented Jan 11, 2025

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2025011103-4.3&flavor=pull-requests

Test run included the following:

New failures, excluding unstable

Compared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2024111705-4.3&flavor=update

Failed tests

16 failures

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/119126#dependencies

3 fixed
  • system_tests_extra

    • TC_00_QVCTest_whonix-gateway-17: test_010_screenshare (failure)
      ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError: 0 == 0
  • system_tests_basic_vm_qrexec_gui_zfs

    • switch_pool: Failed (test died)
      # Test died: command 'dnf install -y ./zfs-release.rpm' failed at /...
  • system_tests_audio@hw1

Unstable tests

  • system_tests_update

    update2/Failed (1/5 times with errors)
    • job 121711 # Test died: command '(set -o pipefail; qubesctl --show-output stat...
  • system_tests_update@hw1

    update2/Failed (1/5 times with errors)
    • job 121711 # Test died: command '(set -o pipefail; qubesctl --show-output stat...
  • system_tests_update@hw7

    update2/Failed (1/5 times with errors)
    • job 121711 # Test died: command '(set -o pipefail; qubesctl --show-output stat...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants