From 371dd5b938e70fa077d1452456fdd203b7a61cb9 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 26 Mar 2025 02:06:11 +0900 Subject: nix: create current-system symlink This is copied at runtime because it appears to be impossible to obtain this path in nix. Signed-off-by: Ophestra --- test/sandbox/case/mapuid.nix | 5 ++--- test/sandbox/case/preset.nix | 5 ++--- test/sandbox/case/tty.nix | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix index 30969a41..f29f1929 100644 --- a/test/sandbox/case/mapuid.nix +++ b/test/sandbox/case/mapuid.nix @@ -111,8 +111,8 @@ } null; nix = fs "800001c0" { store = fs "801001fd" null null; } null; proc = fs "8000016d" null null; - run = fs "800001c0" { - current-system = fs "8000016d" null null; + run = fs "800001ed" { + current-system = fs "80001ff" null null; opengl-driver = fs "80001ff" null null; user = fs "800001ed" { "1000" = fs "800001ed" { @@ -195,7 +195,6 @@ (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") - (ent ignore "/run/current-system" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix index 5366fd48..3f9134fe 100644 --- a/test/sandbox/case/preset.nix +++ b/test/sandbox/case/preset.nix @@ -111,8 +111,8 @@ } null; nix = fs "800001c0" { store = fs "801001fd" null null; } null; proc = fs "8000016d" null null; - run = fs "800001c0" { - current-system = fs "8000016d" null null; + run = fs "800001ed" { + current-system = fs "80001ff" null null; opengl-driver = fs "80001ff" null null; user = fs "800001ed" { "65534" = fs "800001ed" { @@ -195,7 +195,6 @@ (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") - (ent ignore "/run/current-system" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix index 65bdc199..7e6b5519 100644 --- a/test/sandbox/case/tty.nix +++ b/test/sandbox/case/tty.nix @@ -112,8 +112,8 @@ } null; nix = fs "800001c0" { store = fs "801001fd" null null; } null; proc = fs "8000016d" null null; - run = fs "800001c0" { - current-system = fs "8000016d" null null; + run = fs "800001ed" { + current-system = fs "80001ff" null null; opengl-driver = fs "80001ff" null null; user = fs "800001ed" { "65534" = fs "800001ed" { @@ -197,7 +197,6 @@ (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") - (ent ignore "/run/current-system" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") -- cgit v1.3.1