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

make-disk-image: add hybrid and dynamic sized images #89331

Merged
merged 1 commit into from Jul 28, 2020

Conversation

@Lassulus
Copy link
Contributor

Lassulus commented Jun 1, 2020

I was bitten by the fixed diskSize a couple of times.
Also there was no way to increase the boot partition size, which also made some problems with unfree firmware.
I also added hybrid images, which could be booted via efi or mbr, if used with grub.
Will still have to test around and see if any problems arise. Also I would prefer to use sgdisk over parted since I prefer the script interface. But there are problems with msdos partiton tables, so I implemented it with parted.

@ofborg ofborg bot added the 6.topic: nixos label Jun 1, 2020
@Lassulus Lassulus changed the title WIP make-disk-image: add hybrid and dynamic sized images WIP: make-disk-image: add hybrid and dynamic sized images Jun 1, 2020
@Lassulus Lassulus force-pushed the Lassulus:make-disk-image branch from 3acfb89 to d1f749a Jun 4, 2020
@Lassulus Lassulus changed the title WIP: make-disk-image: add hybrid and dynamic sized images make-disk-image: add hybrid and dynamic sized images Jun 4, 2020
@Lassulus Lassulus requested review from alyssais and dezgeg and removed request for alyssais Jun 4, 2020
@Lassulus Lassulus force-pushed the Lassulus:make-disk-image branch from d1f749a to 2534c63 Jul 9, 2020
@Lassulus
Copy link
Contributor Author

Lassulus commented Jul 9, 2020

This now also incorporates a fix to run nixos-install again after #90431

@nixos-discourse
Copy link

nixos-discourse commented Jul 9, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/218

@vcunat
Copy link
Member

vcunat commented Jul 10, 2020

I don't really understand stuff in this nix file, so I just pushed an improved version of the easy fix as 8d05772.

@Lassulus Lassulus force-pushed the Lassulus:make-disk-image branch from 2534c63 to 8a92517 Jul 10, 2020
@Lassulus
Copy link
Contributor Author

Lassulus commented Jul 25, 2020

after some testing I realized, that this fails sometimes when building efi/hybrid images. will have to debug and fix that.

@Lassulus Lassulus changed the title make-disk-image: add hybrid and dynamic sized images WIP: make-disk-image: add hybrid and dynamic sized images Jul 25, 2020
@Lassulus Lassulus force-pushed the Lassulus:make-disk-image branch from 8a92517 to 78410dc Jul 25, 2020
@Lassulus Lassulus force-pushed the Lassulus:make-disk-image branch from 78410dc to 883a607 Jul 27, 2020
@Lassulus Lassulus changed the title WIP: make-disk-image: add hybrid and dynamic sized images make-disk-image: add hybrid and dynamic sized images Jul 28, 2020
@Lassulus
Copy link
Contributor Author

Lassulus commented Jul 28, 2020

tested all partitionTableTypes with my x220 and all of them booted. So this seems good to go.

@Lassulus Lassulus merged commit 77cf1a6 into NixOS:master Jul 28, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="883a607"; rev="883a6079fd96dad65a454683d512c573adb87a2f"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="883a607"; rev="883a6079fd96dad65a454683d512c573adb87a2f"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="883a607"; rev="883a6079fd96dad65a454683d512c573adb87a2f"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="883a607"; rev="883a6079fd96dad65a454683d512c573adb87a2f"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="883a607"; rev="883a6079fd96dad65a454683d512c573adb87a2f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="883a607"; rev="883a6079fd96dad65a454683d512c573adb87a2f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="883a607"; rev="883a6079fd96dad65a454683d512c573adb87a2f"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.