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

openshift: Fix path to mount and findmnt command #41272

Merged
merged 2 commits into from May 31, 2018
Merged

openshift: Fix path to mount and findmnt command #41272

merged 2 commits into from May 31, 2018

Conversation

jensbin
Copy link
Contributor

@jensbin jensbin commented May 30, 2018

Fix openshift oc cluster up mount

(cherry picked from commit fd09c3d)

Motivation for this change

Reason: The basic functionality to spin up a local cluster using "oc
cluster up" is broken due to wrong paths to mount and findmnt.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@jensbin
openshift: Fix path to mount and findmnt command
82b02fd 
Fix openshift oc cluster up mount

(cherry picked from commit fd09c3d)
Reason: The basic functionality to spin up a local cluster using "oc
cluster up" is broken due to wrong paths to mount and findmnt.
symphorien
symphorien reviewed May 30, 2018
View reviewed changes
pkgs/applications/networking/cluster/openshift/default.nix Outdated

substituteInPlace pkg/oc/bootstrap/docker/host/host.go \
--replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't it be mkdir instead of mount ?

Copy link
Contributor Author

@jensbin jensbin May 30, 2018 •
edited

Choose a reason for hiding this comment

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

Thanks for the review. I have accidentally overseen this. Fix to master: #41274

@xeji
Copy link
Contributor

xeji commented May 31, 2018

@GrahamcOfBorg build openshift

@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: openshift

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: openshift

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/cngjj5p874jlw3qk72hflns23vshcncx-openshift-origin-3.9.0
shrinking /nix/store/cngjj5p874jlw3qk72hflns23vshcncx-openshift-origin-3.9.0/bin/oc
shrinking /nix/store/cngjj5p874jlw3qk72hflns23vshcncx-openshift-origin-3.9.0/bin/openshift
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/cngjj5p874jlw3qk72hflns23vshcncx-openshift-origin-3.9.0/bin
patching script interpreter paths in /nix/store/cngjj5p874jlw3qk72hflns23vshcncx-openshift-origin-3.9.0
checking for references to /build in /nix/store/cngjj5p874jlw3qk72hflns23vshcncx-openshift-origin-3.9.0...
/nix/store/cngjj5p874jlw3qk72hflns23vshcncx-openshift-origin-3.9.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: openshift

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/y1q8bsdfa4p3vwzvgbbh3my3wipxbj9g-openshift-origin-3.9.0
shrinking /nix/store/y1q8bsdfa4p3vwzvgbbh3my3wipxbj9g-openshift-origin-3.9.0/bin/oc
shrinking /nix/store/y1q8bsdfa4p3vwzvgbbh3my3wipxbj9g-openshift-origin-3.9.0/bin/openshift
strip is /nix/store/ppn001bfygzlqx4h50n9zgxc3kqv2d6k-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/y1q8bsdfa4p3vwzvgbbh3my3wipxbj9g-openshift-origin-3.9.0/bin
patching script interpreter paths in /nix/store/y1q8bsdfa4p3vwzvgbbh3my3wipxbj9g-openshift-origin-3.9.0
checking for references to /build in /nix/store/y1q8bsdfa4p3vwzvgbbh3my3wipxbj9g-openshift-origin-3.9.0...
/nix/store/y1q8bsdfa4p3vwzvgbbh3my3wipxbj9g-openshift-origin-3.9.0

@xeji xeji merged commit 8b4f5f4 into NixOS:release-18.03 May 31, 2018
@jensbin jensbin deleted the openshift_fix branch May 31, 2018 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@symphorien symphorien symphorien approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jensbin @xeji @GrahamcOfBorg @symphorien