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.

Sign up for GitHub

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

Jump to bottom

Workaround systemd's broken /etc/resolv.conf symlink #373

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Workaround systemd's broken /etc/resolv.conf symlink #373

merged 2 commits into from
Apr 14, 2022

Conversation

marmarek
Copy link
Member

See commit messages for details.

Fixes QubesOS/qubes-issues#7429

marmarek added 2 commits April 12, 2022 21:28
@marmarek
Workaround systemd's broken /etc/resolv.conf symlink
cde610d 
systemd creates a /etc/resolv.conf symlink independently of
systemd-resolved (before the service is started, even if not going to be
started). Lennart says whatever wants to modify /etc/resolv.conf, should
remove the symlink. So, do just that.

Fixes QubesOS/qubes-issues#7429
@marmarek
Register DNS server in systemd-resolved
0b028df 
When configuring DNS, do so in resolved too, not only plain
/etc/resolv.conf. The former should load the latter, but it saves one
indirection (resolved is used via NSS directly, at least on Fedora, even
if /etc/resolv.conf points somewhere else).

Related to QubesOS/qubes-issues#7429
@marmarek
Copy link
Member Author

Manual test passed

@qubesos-bot
Copy link

qubesos-bot commented Apr 14, 2022 •
edited
Loading

OpenQA test summary

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

New failures, excluding unstable

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

Failed tests

9 failures

  • system_tests_network_updates

  • system_tests_dispvm

    • [unstable] TC_20_DispVM_debian-11: test_100_open_in_dispvm (failure)
      AssertionError: './open-file test.txt' failed with ./open-file test...

    • [unstable] TC_20_DispVM_whonix-ws-16: test_100_open_in_dispvm (failure)
      AssertionError: libvirt event impl drain timeout

  • system_tests_basic_vm_qrexec_gui@hw1

  • system_tests_suspend@hw1

    • suspend: wait_serial (wait serial expected)
      # wait_serial expected: qr/p5~T5-\d+-/u...

    • suspend: Failed (test died + timed out)
      # Test died: command 'true' timed out at qubesos/tests/suspend.pm l...

  • system_tests_pvgrub_salt_storage

    • [unstable] TC_40_PVGrub_debian-11: test_000_standalone_vm (error + timed out)
      qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...

    • [unstable] TC_40_PVGrub_debian-11: test_010_template_based_vm (error + timed out)
      qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...

  • system_tests_basic_vm_qrexec_gui_ext4

    • TC_03_QvmRevertTemplateChanges: test_000_revert_linux (error)
      NotImplementedError: FileVolume supports maximum 1 volume revision ...

Fixed failures

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

2 fixed

  • system_tests_network_updates

  • system_tests_basic_vm_qrexec_gui@hw1

Unstable tests

  • system_tests_splitgpg

    TC_10_Thunderbird_debian-11/test_010_send_receive_inline_signed_only (1/5 times with errors)
    • job 37296 dogtail.tree.SearchError: descendent of [application | Thunderbird]...

  • system_tests_qrexec

    TC_00_Qrexec_debian-11/test_050_qrexec_simple_eof (1/5 times with errors)
    • job 37915 AssertionError: Timeout, probably EOF wasn't transferred to the VM ...
    TC_00_Qrexec_debian-11/test_070_qrexec_vm_simultaneous_write (1/5 times with errors)
    • job 37527 AssertionError: Timeout, probably deadlock

  • system_tests_network_ipv6

    VmIPv6Networking_debian-11/test_020_simple_proxyvm_nm (2/5 times with errors)
    • job 36481 AssertionError: 1 != 0 : nm-applet window not found
    • job 37538 AssertionError: 1 != 0 : nm-applet window not found
    VmIPv6Networking_whonix-ws-16/test_020_simple_proxyvm_nm (1/5 times with errors)
    VmIPv6Networking_debian-11/test_520_ipv6_simple_proxyvm_nm (1/5 times with errors)
    • job 37926 AssertionError: 1 != 0 : nm-applet window not found

  • system_tests_network_updates

    TC_10_QvmTemplate_debian-11/test_010_template_install (1/5 times with errors)
    • job 37927 AssertionError: libvirt event impl drain timeout
    TC_10_QvmTemplate_whonix-gw-16/test_010_template_install (1/5 times with errors)
    • job 36943 AssertionError: libvirt event impl drain timeout

  • system_tests_dispvm

    TC_20_DispVM_debian-11/test_100_open_in_dispvm (2/5 times with errors)
    • job 37312 AssertionError: './open-file test.txt' failed with ./open-file test...
    • job 37521 AssertionError: './open-file test.txt' failed with ./open-file test...
    TC_20_DispVM_whonix-ws-16/test_100_open_in_dispvm (4/5 times with errors)
    • job 36464 AssertionError: libvirt event impl drain timeout
    • job 37312 AssertionError: libvirt event impl drain timeout
    • job 37521 AssertionError: './open-file test.txt' failed with ./open-file test...
    • job 37909 AssertionError: libvirt event impl drain timeout

  • system_tests_basic_vm_qrexec_gui_xfs

    TC_30_Gui_daemon/test_000_clipboard (1/5 times with errors)
    • job 36469 self.assertEqual(clipboard_content, ... AssertionError: '' != 'test23'
    TC_00_AppVM_debian-11-pool/test_221_audio_rec_muted (1/5 times with errors)
    • job 37526 subprocess.CalledProcessError: Command '['sudo', '-E', '-u', 'user'...

  • system_tests_basic_vm_qrexec_gui@hw1

    TC_30_Gui_daemon/test_000_clipboard (1/5 times with errors)
    • job 37531 FileNotFoundError: [Errno 2] No such file or directory: '/var/run/q...

  • system_tests_pvgrub_salt_storage

    TC_40_PVGrub_debian-11/test_000_standalone_vm (2/5 times with errors)
    • job 36944 qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...
    • job 37928 qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...
    TC_40_PVGrub_debian-11/test_010_template_based_vm (4/5 times with errors)
    • job 36483 qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...
    • job 36944 qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...
    • job 37540 qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...
    • job 37928 qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...

  • system_tests_network

    VmNetworking_debian-11/test_020_simple_proxyvm_nm (1/5 times with errors)
    • job 37537 AssertionError: 1 != 0 : nm-applet window not found
    VmNetworking_whonix-gw-16/test_050_spoof_ip (1/5 times with errors)

  • system_tests_basic_vm_qrexec_gui_btrfs

    TC_30_Gui_daemon/test_000_clipboard (1/5 times with errors)
    • job 37524 self.assertEqual(clipboard_content, ... AssertionError: '' != 'test23'

  • system_tests_basic_vm_qrexec_gui_ext4

    TC_30_Gui_daemon/test_000_clipboard (2/5 times with errors)
    • job 37280 self.assertEqual(clipboard_content, ... AssertionError: '' != 'test22'
    • job 37913 self.assertEqual(clipboard_content, ... AssertionError: '' != 'test22'
    TC_00_AppVM_whonix-gw-16-pool/test_000_start_shutdown (1/5 times with errors)
    • job 37552 qubes.exc.QubesVMShutdownTimeoutError: Domain shutdown timed out: '...
    TC_00_AppVM_whonix-gw-16-pool/test_010_run_xterm (1/5 times with errors)
    • job 37552 OSError: Volume /var/lib/qubes-pool/appvms/test-inst-vm1/private.im...

  • system_tests_extra

    TC_00_PDFConverter_debian-11/test_001_two_pages (1/5 times with errors)
    • job 37287 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...

  • system_tests_basic_vm_qrexec_gui

    TC_30_Gui_daemon/test_000_clipboard (1/5 times with errors)
    • job 37531 FileNotFoundError: [Errno 2] No such file or directory: '/var/run/q...

@marmarek marmarek merged commit 0b028df into QubesOS:master Apr 14, 2022
@marmarek marmarek mentioned this pull request Apr 27, 2022
Closed
@marmarek marmarek deleted the resolved branch October 24, 2022 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
openqa-pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

No DNS in inheriting VMs after enabling fedora-35 template's fedora-updates-testing repo and updating
2 participants
@marmarek @qubesos-bot