diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-01-29 07:18:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 07:18:50 +0000 |
| commit | e5ce05cc1eee0b8d890726e9826791ef95c51793 (patch) | |
| tree | 56fad483544dc1048f70043a2430766ee2275467 /nixos | |
| parent | 27c60f4959e445498c14eb8901031923f28b4fe0 (diff) | |
| parent | 60c8cf4e02f240616e906d6333ebef23b6dfb382 (diff) | |
| download | nixpkgs-e5ce05cc1eee0b8d890726e9826791ef95c51793.tar nixpkgs-e5ce05cc1eee0b8d890726e9826791ef95c51793.tar.gz nixpkgs-e5ce05cc1eee0b8d890726e9826791ef95c51793.tar.bz2 nixpkgs-e5ce05cc1eee0b8d890726e9826791ef95c51793.tar.lz nixpkgs-e5ce05cc1eee0b8d890726e9826791ef95c51793.tar.xz nixpkgs-e5ce05cc1eee0b8d890726e9826791ef95c51793.tar.zst nixpkgs-e5ce05cc1eee0b8d890726e9826791ef95c51793.zip | |
Merge pull request #67493 from clefru/make-disk-image
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 3f50bb431c5..023d0791a5c 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -257,7 +257,8 @@ let format' = format; in let ''} echo "copying staging root to image..." - cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / + cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / || + (echo >&2 "ERROR: cptofs failed. diskSize might be too small for closure."; exit 1) ''; in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name |