From 5a6853b3bfb741303a956363a4b80cd20332628b Mon Sep 17 00:00:00 2001 From: olaf Date: Thu, 28 Jul 2022 16:56:07 +0200 Subject: [PATCH] use consistently user alice for examples --- nixos/doc/manual/configuration/gpu-accel.chapter.md | 4 ++-- .../doc/manual/from_md/configuration/gpu-accel.chapter.xml | 4 ++-- nixos/maintainers/scripts/lxd/lxd-image-inner.nix | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- nixos/modules/services/games/crossfire-server.nix | 2 +- nixos/modules/services/games/deliantra-server.nix | 2 +- nixos/tests/docker-tools.nix | 4 ++-- pkgs/build-support/docker/examples.nix | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md index 08b6af5d98a..835cbad5548 100644 --- a/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -169,7 +169,7 @@ configuration, GPU devices have world-read/write permissions (`/dev/dri/renderD*`) or are tagged as `uaccess` (`/dev/dri/card*`). The access control lists of devices with the `uaccess` tag will be updated automatically when a user logs in through `systemd-logind`. For example, -if the user *jane* is logged in, the access control list should look as +if the user *alice* is logged in, the access control list should look as follows: ```ShellSession @@ -178,7 +178,7 @@ $ getfacl /dev/dri/card0 # owner: root # group: video user::rw- -user:jane:rw- +user:alice:rw- group::rw- mask::rw- other::--- diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml index 8e780c5dee9..cc559a1933d 100644 --- a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -194,7 +194,7 @@ environment.variables.VK_ICD_FILENAMES = devices with the uaccess tag will be updated automatically when a user logs in through systemd-logind. For example, if the user - jane is logged in, the access control list + alice is logged in, the access control list should look as follows: @@ -203,7 +203,7 @@ $ getfacl /dev/dri/card0 # owner: root # group: video user::rw- -user:jane:rw- +user:alice:rw- group::rw- mask::rw- other::--- diff --git a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index 74634fd1671..ead3d4e9940 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -55,7 +55,7 @@ with lib; # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { + # users.users.alice = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # }; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 4490ad84e14..e46a2df8fa6 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -175,7 +175,7 @@ in # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { + # users.users.alice = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # packages = with pkgs; [ diff --git a/nixos/modules/services/games/crossfire-server.nix b/nixos/modules/services/games/crossfire-server.nix index 4b9813245fb..a0dc1e6c564 100644 --- a/nixos/modules/services/games/crossfire-server.nix +++ b/nixos/modules/services/games/crossfire-server.nix @@ -76,7 +76,7 @@ in { { dm_file = ''' admin:secret_password:localhost - jane:xyzzy:* + alice:xyzzy:* '''; ban_file = ''' # Bob is a jerk diff --git a/nixos/modules/services/games/deliantra-server.nix b/nixos/modules/services/games/deliantra-server.nix index 1a061860124..17bdf2aef77 100644 --- a/nixos/modules/services/games/deliantra-server.nix +++ b/nixos/modules/services/games/deliantra-server.nix @@ -73,7 +73,7 @@ in { { dm_file = ''' admin:secret_password:localhost - jane:xyzzy:* + alice:xyzzy:* '''; motd = "Welcome to Deliantra!"; settings = ''' diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 99a968f17af..d76f70b791c 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -346,7 +346,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.layeredImageWithFakeRootCommands}'" ) docker.succeed( - "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'" ) with subtest("Ensure docker load on merged images loads all of the constituent images"): @@ -389,7 +389,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.mergedBashFakeRoot}'" ) docker.succeed( - "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'" ) with subtest("The image contains store paths referenced by the fakeRootCommands output"): diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 16941a72617..ff3934941c7 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -584,8 +584,8 @@ rec { pkgs.pkgsStatic.busybox ]; fakeRootCommands = '' - mkdir -p ./home/jane - chown 1000 ./home/jane + mkdir -p ./home/alice + chown 1000 ./home/alice ln -s ${pkgs.hello.overrideAttrs (o: { # A unique `hello` to make sure that it isn't included via another mechanism by accident. configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ]; @@ -607,7 +607,7 @@ rec { ]; # tarball consisting of bash and layered image with different owner of the - # /home/jane directory + # /home/alice directory mergedBashFakeRoot = pkgs.dockerTools.mergeImages [ bash layeredImageWithFakeRootCommands