diff options
Diffstat (limited to 'test/sandbox')
| -rw-r--r-- | test/sandbox/case/default.nix | 2 | ||||
| -rw-r--r-- | test/sandbox/case/mapuid.nix | 3 | ||||
| -rw-r--r-- | test/sandbox/case/preset.nix | 3 | ||||
| -rw-r--r-- | test/sandbox/case/tty.nix | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/test/sandbox/case/default.nix b/test/sandbox/case/default.nix index 5bdbba8f..d7c50836 100644 --- a/test/sandbox/case/default.nix +++ b/test/sandbox/case/default.nix @@ -48,7 +48,7 @@ let inherit (tc) tty mapRealUid; share = foot; packages = [ ]; - command = "${checkSandbox tc.name tc.want} > /dev/console"; + command = builtins.toString (checkSandbox tc.name tc.want); }; in { diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix index 65fe55f0..11e1e733 100644 --- a/test/sandbox/case/mapuid.nix +++ b/test/sandbox/case/mapuid.nix @@ -19,7 +19,7 @@ } null; bin = fs "800001ed" { sh = fs "80001ff" null null; } null; dev = fs "800001ed" { - console = fs "1a4" null null; + console = fs "4200190" null null; core = fs "80001ff" null null; dri = fs "800001ed" { by-path = fs "800001ed" { @@ -196,6 +196,7 @@ (ent "/urandom" "/dev/urandom" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/tty" "/dev/tty" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/" "/dev/pts" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,mode=620,ptmxmode=666") + (ent ignore "/dev/console" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,gid=3,mode=620,ptmxmode=666") (ent "/" "/dev/mqueue" "rw,relatime" "mqueue" "mqueue" "rw") (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") diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix index 71aaeb55..ecb35e2b 100644 --- a/test/sandbox/case/preset.nix +++ b/test/sandbox/case/preset.nix @@ -19,7 +19,7 @@ } null; bin = fs "800001ed" { sh = fs "80001ff" null null; } null; dev = fs "800001ed" { - console = fs "1a4" null null; + console = fs "4200190" null null; core = fs "80001ff" null null; dri = fs "800001ed" { by-path = fs "800001ed" { @@ -196,6 +196,7 @@ (ent "/urandom" "/dev/urandom" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/tty" "/dev/tty" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/" "/dev/pts" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,mode=620,ptmxmode=666") + (ent ignore "/dev/console" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,gid=3,mode=620,ptmxmode=666") (ent "/" "/dev/mqueue" "rw,relatime" "mqueue" "mqueue" "rw") (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") diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix index 67d5d893..85320d4b 100644 --- a/test/sandbox/case/tty.nix +++ b/test/sandbox/case/tty.nix @@ -19,7 +19,7 @@ } null; bin = fs "800001ed" { sh = fs "80001ff" null null; } null; dev = fs "800001ed" { - console = fs "1a4" null null; + console = fs "4200190" null null; core = fs "80001ff" null null; dri = fs "800001ed" { by-path = fs "800001ed" { @@ -196,6 +196,7 @@ (ent "/urandom" "/dev/urandom" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/tty" "/dev/tty" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/" "/dev/pts" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,mode=620,ptmxmode=666") + (ent ignore "/dev/console" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,gid=3,mode=620,ptmxmode=666") (ent "/" "/dev/mqueue" "rw,relatime" "mqueue" "mqueue" "rw") (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") |