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

systemd: update to fix nspawn containers #47264

Merged
merged 1 commit into from Sep 24, 2018
Merged

systemd: update to fix nspawn containers #47264

merged 1 commit into from Sep 24, 2018

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Sep 24, 2018 •
edited

This fixes nspawn containers with older systemd inside currently failing
to start.

See:
NixOS/systemd#23
systemd/systemd#10104
#47253

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.

Please backport to 18.03 as well.

cc @vcunat @samueldr @fpletz @Mic92

@Mic92
Copy link
Member

Mic92 commented Sep 24, 2018

We usually put this into staging.

@Mic92 Mic92 changed the title systemd: bump to rev 31859ddd35fc3fa82a583744caa836d356c31d7f systemd: update to fix nspawn containers Sep 24, 2018
@flokli flokli changed the base branch from master to staging September 24, 2018 08:44
@flokli
systemd: bump to rev 31859ddd35fc3fa82a583744caa836d356c31d7f
0618156 
This fixes nspawn containers with older systemd inside currently failing
to start.

See:
NixOS/systemd#23
systemd/systemd#10104
NixOS#47253
@flokli
Copy link
Contributor Author

flokli commented Sep 24, 2018

@Mic92 changed base, and rebased. Should I file a separate PR for 18.09 staging?

@xeji
Copy link
Contributor

xeji commented Sep 24, 2018

Should I file a separate PR for 18.09 staging?

No need, we can cherry-pick it directly.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: systemd

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@Mic92 Mic92 merged commit c3cc34f into NixOS:staging Sep 24, 2018
Mic92 pushed a commit that referenced this pull request Sep 24, 2018
@flokli @Mic92
systemd: update to fix nspawn containers (#47264)
7eb1fa2 
This fixes nspawn containers with older systemd inside currently failing
to start.

See:
NixOS/systemd#23
systemd/systemd#10104
#47253
(cherry picked from commit c3cc34f)
@Mic92
Copy link
Member

Mic92 commented Sep 24, 2018

staging backport: 7eb1fa2

@flokli flokli deleted the systemd-v239-bump-nspawn branch September 24, 2018 09:08
@flokli
Copy link
Contributor Author

flokli commented Sep 24, 2018

Thanks!

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: systemd

Partial log (click to expand)

cannot build derivation '/nix/store/scl9wfrv6f89zkjg7m8jvrs1c1q73c5b-libmicrohttpd-0.9.59.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/iv3xlpvca2phbcwgwqg9pshhyl7skb0r-meson-0.46.1.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/1xz5krim9gl3c8n66zfn9i7vq4nzrn80-python3.6-lxml-4.2.4.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/4im8z3fk2lgjvw73fayckwllipyrn56b-gnome-doc-utils-0.20.10.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/b56l8jb1anda7hx7j4x2vrha1mghgp2b-python3-3.6.6-env.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/5zk5lm09rj60xkgzmks5d0dcv48xyb3m-shadow-4.6.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/mxvr07p2k28s0majxsv0hn78zppp9v46-util-linux-2.32.1.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/sl9m7s6fsb3j7hr0hd61b35x2a61rpha-glib-2.56.0.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/6nwhwdg4q07m8ds4y85a54sxpw2dfnff-systemd-239.drv': 43 dependencies couldn't be built
error: build of '/nix/store/6nwhwdg4q07m8ds4y85a54sxpw2dfnff-systemd-239.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: systemd

Partial log (click to expand)

gzipping man pages under /nix/store/p2y5siyz8d3wnmq53dxar7xyr3x4ggcb-systemd-239-man/share/man/
strip is /nix/store/338kyqvbhhyr0qayq3mv01k0axc1sld4-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/p2y5siyz8d3wnmq53dxar7xyr3x4ggcb-systemd-239-man
checking for references to /build in /nix/store/p2y5siyz8d3wnmq53dxar7xyr3x4ggcb-systemd-239-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/g5s2zy3p8xcr0rx5hk9rp27nsib948sk-systemd-239-dev
strip is /nix/store/338kyqvbhhyr0qayq3mv01k0axc1sld4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/g5s2zy3p8xcr0rx5hk9rp27nsib948sk-systemd-239-dev/lib
patching script interpreter paths in /nix/store/g5s2zy3p8xcr0rx5hk9rp27nsib948sk-systemd-239-dev
checking for references to /build in /nix/store/g5s2zy3p8xcr0rx5hk9rp27nsib948sk-systemd-239-dev...
/nix/store/xn18b5ar9xjc9rm4slsc3ddmq35im7js-systemd-239

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
10.rebuild-darwin: 0 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@flokli @Mic92 @xeji @GrahamcOfBorg