diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-28 16:59:19 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-28 17:07:18 +0100 |
| commit | d728c7d08af25e635db599c2c44c96afa10d9337 (patch) | |
| tree | 42906a2b3583a285afdcceae82bd78c2b916f0d0 /vm-lib/make-vm.nix | |
| parent | 94d3c1b8280bd94c8f7b5cc09b3809403f2d1052 (diff) | |
| download | spectrum-d728c7d08af25e635db599c2c44c96afa10d9337.tar spectrum-d728c7d08af25e635db599c2c44c96afa10d9337.tar.gz spectrum-d728c7d08af25e635db599c2c44c96afa10d9337.tar.bz2 spectrum-d728c7d08af25e635db599c2c44c96afa10d9337.tar.lz spectrum-d728c7d08af25e635db599c2c44c96afa10d9337.tar.xz spectrum-d728c7d08af25e635db599c2c44c96afa10d9337.tar.zst spectrum-d728c7d08af25e635db599c2c44c96afa10d9337.zip | |
scripts/make-erofs.sh: take paths on stdin
The command line for the rootfs EROFS is nearing argv limits. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'vm-lib/make-vm.nix')
| -rw-r--r-- | vm-lib/make-vm.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vm-lib/make-vm.nix b/vm-lib/make-vm.nix index 82b1d03..f6234f1 100644 --- a/vm-lib/make-vm.nix +++ b/vm-lib/make-vm.nix @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> +# SPDX-FileCopyrightText: 2022, 2024 Alyssa Ross <hi@alyssa.is> # SPDX-FileCopyrightText: 2022 Unikie { pkgs ? import <nixpkgs> {} @@ -35,9 +35,11 @@ runCommand "spectrum-vm" { } '' mkdir -p "$out"/{blk,providers,shared-dirs} - ${../scripts/make-erofs.sh} -L ext -- "$out/blk/run.img" ${run} run \ - $(comm -23 <(sort ${writeReferencesToFile run}) \ - <(sort ${writeReferencesToFile basePaths}) | sed p) + ( + printf "%s\nrun\n" ${run} + comm -23 <(sort ${writeReferencesToFile run}) \ + <(sort ${writeReferencesToFile basePaths}) | sed p + ) | ${../scripts/make-erofs.sh} -L ext "$out/blk/run.img" pushd "$out" |