Add options to build disk image function #50239
Merged
+5
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
6.topic: nixos
nixos/lib/make-disk-image.nix
Outdated
| @@ -178,7 +184,7 @@ let format' = format; in let | |||
| nix-store --load-db < ${closureInfo}/registration | |||
|
|
|||
| echo "running nixos-install..." | |||
| nixos-install --root $root --no-bootloader --no-root-passwd \ | |||
| nixos-install${suffix} --root $root --no-bootloader --no-root-passwd \ | |||
There was a problem hiding this comment.
I think this is a bug. It shouldn't have a suffix & that's not documented anywhere. It must come from how make-derivation overrides name:
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/make-derivation.nix#L180-L186
|
The label change looks good though! |
GrahamcOfBorg
added
10.rebuild-linux: 1-10
and removed
10.rebuild-linux: 0
danbst
pushed a commit
to danbst/nixpkgs
that referenced
this pull request
Jan 31, 2019
* add options to build disk image function * Revert suffix changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
I'd like to be able to build a disk image with a custom label. This patch simply adds an option to do that. When the option is omitted, this patch preserves the old behavior.
Additionally, when cross-compiling,
nixos-enterhas a suffix based on the target triple. This needs to be added to the nixos-enter commands for the cross-compile to succeedThings done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)