summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-06-17 18:38:41 +0000
committerAlyssa Ross <hi@alyssa.is>2023-06-17 18:42:08 +0000
commit35c8269325c3d03c0592a25abb9a469bd41697e7 (patch)
tree7d5fe58eaa00ba263097163a9e4fc66716d3cc46
parentc524495093e4ad7b4d6eeea0d90b9d6d8951f0e1 (diff)
downloadspectrum-35c8269325c3d03c0592a25abb9a469bd41697e7.tar
spectrum-35c8269325c3d03c0592a25abb9a469bd41697e7.tar.gz
spectrum-35c8269325c3d03c0592a25abb9a469bd41697e7.tar.bz2
spectrum-35c8269325c3d03c0592a25abb9a469bd41697e7.tar.lz
spectrum-35c8269325c3d03c0592a25abb9a469bd41697e7.tar.xz
spectrum-35c8269325c3d03c0592a25abb9a469bd41697e7.tar.zst
spectrum-35c8269325c3d03c0592a25abb9a469bd41697e7.zip
vm-lib/make-vm.nix: remove indirection
There's no longer any need to construct a synthentic root in this
script, since make-erofs.sh accepts source/dest pairs.

Signed-off-by: Alyssa Ross <hi@alyssa.is>
-rw-r--r--vm-lib/make-vm.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/vm-lib/make-vm.nix b/vm-lib/make-vm.nix
index 45ff78d..85a0ce6 100644
--- a/vm-lib/make-vm.nix
+++ b/vm-lib/make-vm.nix
@@ -32,11 +32,7 @@ runCommand "spectrum-vm" {
 } ''
   mkdir -p "$out"/{blk,providers,shared-dirs}
 
-  mkdir root
-  cd root
-  ln -s ${run} run
-
-  ${../scripts/make-erofs.sh} -L ext -- "$out/blk/run.img" run run \
+  ${../scripts/make-erofs.sh} -L ext -- "$out/blk/run.img" ${run} run \
       $(comm -23 <(sort ${writeReferencesToFile run}) \
           <(sort ${writeReferencesToFile basePaths}) | sed p)