Skip to content

systemd: disable remote support#94356

Merged
edolstra merged 1 commit intoNixOS:staging-nextfrom
flokli:systemd-disable-remote
Jul 31, 2020
Merged

systemd: disable remote support#94356
edolstra merged 1 commit intoNixOS:staging-nextfrom
flokli:systemd-disable-remote

Conversation

@flokli
Copy link
Copy Markdown
Member

@flokli flokli commented Jul 31, 2020

This disabled systemd-journal-upload and systemd-journal-remote.

We didn't install the unit files anyways, so this was probably not used
at all, and currently fails to build due to libmicrohttpd and systemd
code being incompatible:

../src/journal-remote/journal-remote-main.c: In function ‘setup_microhttpd_server’:
../src/journal-remote/journal-remote-main.c:431:38: error: passing argument 5 of ‘MHD_start_daemon’ from incompatible pointer type [-Werror=incompatible-pointer-types]
Motivation for this change

#94296 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@flokli
systemd: disable remote support
ae896e0 
This disabled systemd-journal-upload and systemd-journal-remote.

We didn't install the unit files anyways, so this was probably not used
at all, and currently fails to build due to libmicrohttpd and systemd
code being incompatible:

```
../src/journal-remote/journal-remote-main.c: In function ‘setup_microhttpd_server’:
../src/journal-remote/journal-remote-main.c:431:38: error: passing argument 5 of ‘MHD_start_daemon’ from incompatible pointer type [-Werror=incompatible-pointer-types]
```
@flokli flokli requested a review from FRidh July 31, 2020 16:39
@flokli flokli mentioned this pull request Jul 31, 2020
Merged
10 tasks
@flokli flokli requested a review from arianvp July 31, 2020 16:40
@ofborg ofborg bot requested review from andir and edolstra July 31, 2020 16:57
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 31, 2020
@edolstra edolstra merged commit 941aec4 into NixOS:staging-next Jul 31, 2020
@flokli flokli deleted the systemd-disable-remote branch July 31, 2020 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@arianvp arianvp Awaiting requested review from arianvp

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

systemd
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@flokli @fignew @edolstra