Monorepo for Tangled
nix/microvm: make sure tmp is diskbacked
Signed-off-by: dawn <dawn@tangled.org>
+17
-1
+10
nix/microvm/base.nix
+10
nix/microvm/base.nix
···
307
307
options = ["bind"];
308
308
depends = ["/persist"];
309
309
};
310
+
# bind mount /tmp so our tmp is disk backed...
311
+
fileSystems."/tmp" = {
312
+
device = "/persist/tmp";
313
+
fsType = "none";
314
+
options = ["bind"];
315
+
depends = ["/persist"];
316
+
};
310
317
311
318
# create bind sources before local-fs.target, which means we have to do this
312
319
# at initrd time
···
322
329
};
323
330
"/sysroot/persist/var".d = {
324
331
mode = "0755";
332
+
};
333
+
"/sysroot/persist/tmp".d = {
334
+
mode = "1777";
325
335
};
326
336
};
327
337
}
+7
-1
spindle/engines/microvm/test-spindle-microvm.sh
+7
-1
spindle/engines/microvm/test-spindle-microvm.sh
···
500
500
;;
501
501
esac
502
502
503
+
if [ "$(stat -c %d /tmp)" = "$(stat -c %d /workspace)" ]; then
504
+
echo "tmp_on_persist=yes"
505
+
else
506
+
echo "tmp_on_persist=no"
507
+
fi
508
+
503
509
/run/current-system/sw/bin/nix-store --realise "$store_path" >/dev/null
504
510
' bash "$test_store_path") || return 1
505
511
506
-
check_needles "$out" "^http_version=2(\\.0)?$" || return 1
512
+
check_needles "$out" "^http_version=2(\\.0)?$" "^tmp_on_persist=yes$" || return 1
507
513
echo "success: store path realized from cache and cache proxy accepted cleartext HTTP/2"
508
514
}
509
515