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

cloud-utils: 0.29 -> 0.30 #30018

Merged
merged 1 commit into from Oct 2, 2017
Merged

cloud-utils: 0.29 -> 0.30 #30018

merged 1 commit into from Oct 2, 2017

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Oct 2, 2017

Motivation for this change

The patch I removed was actually not used by this version anymore.

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
    • Linux
  • 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.

orivej
orivej reviewed Oct 2, 2017
View reviewed changes
nixos/modules/virtualisation/grow-partition.nix
substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \
--replace "${pkgs.bash}/bin/sh" "/bin/sh" \
--replace "awk" "gawk" \
--replace "sed" "gnused"
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks strange: you copy bin/sed and then replace sed with gnused. And why don't we copy bin/awk?

Copy link
Member Author

Choose a reason for hiding this comment

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

I actually only restored the previous behavior. Do we have any name collision with gawk and busybox?

Copy link
Member

@copumpkin copumpkin Nov 1, 2017 •
edited

Choose a reason for hiding this comment

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

Super super weird to modify a store path in place taking advantage of the fact that you're in the initrd so it's mutable 😱 especially when we own the package and can just fix the wrapper. What's going on?

Copy link
Member

Choose a reason for hiding this comment

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

Never mind, it's not in place, but still weird to patch the wrapper when we own it.

@orivej
Copy link
Contributor

orivej commented Oct 2, 2017

nixos/tests/cloud-init.nix does not test that growpart really works because it boots a VM without partitions, so I'm not very confident.

@Mic92
Copy link
Member Author

Mic92 commented Oct 2, 2017

Checkout nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops as recommend in cloud-tools package, it does the check.

@Mic92 Mic92 merged commit a8a1025 into NixOS:master Oct 2, 2017
@Mic92 Mic92 deleted the cloud-utils branch October 2, 2017 09:40
@domenkozar domenkozar mentioned this pull request Oct 2, 2017
Closed
8 tasks
@orivej orivej mentioned this pull request Nov 1, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@copumpkin copumpkin copumpkin left review comments

@orivej orivej orivej approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Mic92 @orivej @copumpkin