b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

use consistently user alice for examples

Browse source
This commit is contained in:
olaf 2022-07-28 16:56:07 +02:00
parent 6f73b0ca72
commit 5a6853b3bf
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/doc/manual/configuration/gpu-accel.chapter.md
View file

@ -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::---

4
nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml
View file

@ -194,7 +194,7 @@ environment.variables.VK_ICD_FILENAMES =
devices with the <literal>uaccess</literal> tag will be updated
automatically when a user logs in through
<literal>systemd-logind</literal>. For example, if the user
<emphasis>jane</emphasis> is logged in, the access control list
<emphasis>alice</emphasis> is logged in, the access control list
should look as follows:
</para>
<programlisting>
@ -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::---

2
nixos/maintainers/scripts/lxd/lxd-image-inner.nix
View file

@ -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.
# };

2
nixos/modules/installer/tools/tools.nix
View file

@ -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; [

2
nixos/modules/services/games/crossfire-server.nix
View file

@ -76,7 +76,7 @@ in {
{
dm_file = '''
admin:secret_password:localhost
jane:xyzzy:*
alice:xyzzy:*
''';
ban_file = '''
# Bob is a jerk

2
nixos/modules/services/games/deliantra-server.nix
View file

@ -73,7 +73,7 @@ in {
{
dm_file = '''
admin:secret_password:localhost
jane:xyzzy:*
alice:xyzzy:*
''';
motd = "Welcome to Deliantra!";
settings = '''

4
nixos/tests/docker-tools.nix
View file

@ -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"):

6
pkgs/build-support/docker/examples.nix
View file

@ -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