From ee99e276cf773c7ff139d3f9dee612e24c448311 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 8 Jun 2020 08:26:06 -0400 Subject: [PATCH] quickly: copy out of squashes so systemd doesn't try to unmount them --- quickly.nix | 6 +++++- test.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/quickly.nix b/quickly.nix index 945ea37..2182baa 100644 --- a/quickly.nix +++ b/quickly.nix @@ -48,14 +48,18 @@ in for f in $(rev /nix-store-isos); do dest=$(basename "$f" | rev) + echo "$dest" mkdir "/mnt-root/nix/.squash/$dest" mount -t squashfs -o loop "$f" "/mnt-root/nix/.squash/$dest" ( cd /mnt-root/nix/store/ - ln -s "../.squash/$dest/$dest" "./$dest" + cp -ar "../.squash/$dest/$dest" "./$dest" ) + umount "/mnt-root/nix/.squash/$dest" + rm "$f" set +x done + ls -la /mnt-root/nix/store | grep system-nixos ls -la /mnt-root/nix/store/*-nixos-system*/ ls -la /mnt-root/nix/store/*-nixos-system*/* diff --git a/test.nix b/test.nix index fb06253..4c6ffd5 100644 --- a/test.nix +++ b/test.nix @@ -22,7 +22,7 @@ let machineConfig = pythonDict ( { - qemuFlags = "-boot order=n -m 2000"; + qemuFlags = "-boot order=n -m 4000"; netBackendArgs = "tftp=${config.system.build.ipxeBootDir},bootfile=netboot.ipxe"; } // extraConfig );