Navigation Menu

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

Jump to bottom

Don't use deprecated dbusdirs #68875

Merged
merged 30 commits into from Sep 17, 2019
Merged

Don't use deprecated dbusdirs #68875

merged 30 commits into from Sep 17, 2019

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Sep 16, 2019 •
edited

Motivation for this change

✌️etc/dbus-1/system.d for third party packages.
This is a mix of upstream patches of my own, other people's yet to be merged patches, and using the configure flags projects provided.

There's still a few more I'd like to get but didn't have time for

  • hplip
  • system-config-printer
  • wpa_supplicant
  • rtkit
  • rpm-ostree
Upstream PRs/MRs
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@worldofpeace worldofpeace changed the title Dont use deprecated dbusdirs Don't use deprecated dbusdirs Sep 16, 2019
@jtojnar
Copy link
Contributor

jtojnar commented Sep 16, 2019

Is there any benefit to patching the projects downstream? Unless the legacy directory support is to be removed in near future, I would say this just clutters the expressions without any added value. For the expressions where we are explicitly passing the legacy path, it looks good.

@worldofpeace
Copy link
Contributor Author

@jtojnar All the patches have been submitted upstream, I'm certain they'll all be accepted.

@jtojnar
Copy link
Contributor

jtojnar commented Sep 16, 2019

Yeah, that is good. But I do not see much benefit in applying them here.

@worldofpeace
Copy link
Contributor Author

Yeah, that is good. But I do not see much benefit in applying them here.

I'd disagree. The added value is that the dbus sys directory is now correct, and that's what this PR is for. The patches are the means to this. If I wasn't going to do that I wouldn't have opened this PR.

@worldofpeace worldofpeace mentioned this pull request Sep 16, 2019
Merged
@worldofpeace
accountsservice: Move D-Bus conf file to share/dbus-1/system.d
cfe85bd 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
avahi: Move D-Bus conf file to share/dbus-1/system.d
5067fb6 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
bluez: Move D-Bus conf file to share/dbus-1/system.d
5548dd3 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
geoclue2: Move D-Bus conf file to share/dbus-1/system.d
a2757ec 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
flatpak: Move D-Bus conf file to share/dbus-1/system.d
bdb0ea8 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
cups: Move D-Bus conf file to share/dbus-1/system.d
061ea7d 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
thermald: Move D-Bus conf file to share/dbus-1/system.d
22ad487 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
lightdm: Move D-Bus conf file to share/dbus-1/system.d
6390197 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
systemd: Move D-Bus conf file to share/dbus-1/system.d
41b7323 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
sddm: Move D-Bus conf file to share/dbus-1/system.d
1434539 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
packagekit: Move D-Bus conf file to share/dbus-1/system.d
369f386 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
zbar: Move D-Bus conf file to share/dbus-1/system.d
ac0e914 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
mate.mate-settings-daemon: Move D-Bus conf file to share/dbus-1/system.d
85eff86 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
fwupd: Move D-Bus conf file to share/dbus-1/system.d
ad6aada 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
fprintd: Move D-Bus conf file to share/dbus-1/system.d
d6d3ccf 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
blueman: Move D-Bus conf file to share/dbus-1/system.d
271c4b1 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
cups-pk-helper: Move D-Bus conf file to share/dbus-1/system.d
8e69437 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
polkit: Move D-Bus conf file to share/dbus-1/system.d
9d0e052 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
dnsmasq: Move D-Bus conf file to share/dbus-1/system.d
2220086 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
networkmanager-openvpn: Move D-Bus conf file to share/dbus-1/system.d
d2680d9 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
networkmanager-openconnect: Move D-Bus conf file to share/dbus-1/syst…
43e14db 
…em.d

Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
networkmanager-vpnc: Move D-Bus conf file to share/dbus-1/system.d
8d7adf0 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
networkmanager-fortisslvpn: Move D-Bus conf file to share/dbus-1/syst…
233c878 
…em.d

Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
networkmanager-iodine: Move D-Bus conf file to share/dbus-1/system.d
61221df 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
rpm-ostree: Move D-Bus conf file to share/dbus-1/system.d
dd6e2f7 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
wpa_supplicant: Move D-Bus conf file to share/dbus-1/system.d
40dda73 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
strongswanNM: Move D-Bus conf file to share/dbus-1/system.d
d213944 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
disnix: Move D-Bus conf file to share/dbus-1/system.d
4e2597d 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
snapper: Move D-Bus conf file to share/dbus-1/system.d
5e55f20 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace
connman: Move D-Bus conf file to share/dbus-1/system.d
8ce26c7 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
@worldofpeace worldofpeace merged commit 86c7fc4 into NixOS:staging Sep 17, 2019
@worldofpeace worldofpeace deleted the dont-use-deprecated-dbusdirs branch September 17, 2019 16:21
Mic92 added a commit that referenced this pull request Oct 14, 2019
@Mic92
Revert "fwupd: Move D-Bus conf file to share/dbus-1/system.d"
283ef6b 
This reverts commit ad6aada.

The patch does not apply to our version.
This commit was part of #68875

cc @worldofpeace
@NeQuissimus
Copy link
Member

NeQuissimus commented Oct 14, 2019 •
edited

Pretty sure this broke WPA Supplicant (at least I can't find anything else that would have caused this):

Oct 14 09:22:02 nixus dbus-daemon[1819]: dbus[1819]: Failed to start message bus: Failed to read directory "/nix/store/4n7bwq053a3gfz7w8dyigizvq3iydj0h-wpa_supplicant-2.9/share/dbus-1/system.d": Not a directory
Oct 14 09:22:02 nixus systemd[1769]: systemd-logind.service: Executable /sbin/modprobe missing, skipping: No such file or directory
Oct 14 09:22:03 nixus kernel: iwlwifi 0000:01:00.0: Applying debug destination EXTERNAL_DRAM
Oct 14 09:22:03 nixus kernel: iwlwifi 0000:01:00.0: Applying debug destination EXTERNAL_DRAM
Oct 14 09:22:03 nixus kernel: iwlwifi 0000:01:00.0: FW already configured (0) - re-configuring
Oct 14 09:22:03 nixus kernel: IPv6: ADDRCONF(NETDEV_UP): wlp1s0: link is not ready
Oct 14 09:22:03 nixus dhcpcd[1761]: wlp1s0: waiting for carrier
Oct 14 09:22:03 nixus dhcpcd[1761]: wlp1s0: carrier acquired
Oct 14 09:22:03 nixus dhcpcd[1761]: DUID 00:04:d7:9c:d0:a5:72:1f:c7:40:bd:7d:89:00:f7:a2:77:3c
Oct 14 09:22:03 nixus dhcpcd[1761]: wlp1s0: IAID 88:6f:25:20
Oct 14 09:22:03 nixus dhcpcd[1761]: wlp1s0: adding address fe80::4e34:88ff:fe6f:2520
Oct 14 09:22:03 nixus dhcpcd[1761]: wlp1s0: carrier lost
Oct 14 09:22:03 nixus dhcpcd[1761]: wlp1s0: deleting address fe80::4e34:88ff:fe6f:2520
Oct 14 09:22:33 nixus dhcpcd[1761]: timed out
Oct 14 09:22:33 nixus dhcpcd[1761]: timed out
Oct 14 09:22:33 nixus dhcpcd[1761]: forked to background, child pid 1950

@jtojnar
Copy link
Contributor

jtojnar commented Oct 14, 2019

See #71113

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
6.topic: printing 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@worldofpeace @jtojnar @NeQuissimus @Mic92