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

nixos/google-network-daemon: systemd job type simple instead of oneshot #49692

Merged
merged 1 commit into from Nov 3, 2018
Merged

nixos/google-network-daemon: systemd job type simple instead of oneshot #49692

merged 1 commit into from Nov 3, 2018

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Nov 3, 2018

Motivation for this change

I think "oneshot" was just an oversight during the update to use the network daemon.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@srhb srhb requested a review from zimbatm November 3, 2018 14:23
zimbatm
zimbatm approved these changes Nov 3, 2018
View reviewed changes
Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so too.

All these services have been translated from upstream's systemd units and this one is indeed a "simple" service: https://github.com/GoogleCloudPlatform/compute-image-packages/blob/cd2a4042b2458347a485b993583bf29b674cdc15/google_compute_engine_init/systemd/google-network-daemon.service#L10

@zimbatm zimbatm merged commit 99c052b into NixOS:master Nov 3, 2018
@zimbatm
Copy link
Member

zimbatm commented Nov 3, 2018

It looks like it was fixed in c010c7547c9926dc5a235ff733a43747d34899dd already, investigating.

18.09 also has that one cherry-picked as 6861519

@srhb
Copy link
Contributor Author

srhb commented Nov 3, 2018

Oh dear, I didn't see that...

@zimbatm
Copy link
Member

zimbatm commented Nov 3, 2018

@rickynils is it possible that your fix never got pushed to master? I am only seeing it referenced in the 18.09 commit as being cherry-picked from

@rickynils
Copy link
Member

@zimbatm Yes, I realise that now. I was sure had pushed master, but obviously I messed up. Should I merge my commit to master just so the comment on release-18.09 makes sense?

@zimbatm
Copy link
Member

zimbatm commented Nov 3, 2018

@rickynils ok thanks, I just wanted to double-check my assumptions. master is already fixed thanks to @srhb so it's all good.

@srhb srhb deleted the fix-google-network-daemon branch November 4, 2018 09:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimbatm zimbatm zimbatm approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@srhb @zimbatm @rickynils @GrahamcOfBorg