diff options
author | Florian Klink <flokli@flokli.de> | 2018-06-28 23:48:38 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2018-06-28 23:54:02 +0200 |
commit | 6cabce9abd916f219c1c003719f2e8ba547654c3 (patch) | |
tree | e36001082b73a3a7c0a5882cbb91e818528a9de2 /nixos | |
parent | 9f36618dca41e394470cfb58f2aaf1298f5d519d (diff) | |
download | nixlib-6cabce9abd916f219c1c003719f2e8ba547654c3.tar nixlib-6cabce9abd916f219c1c003719f2e8ba547654c3.tar.gz nixlib-6cabce9abd916f219c1c003719f2e8ba547654c3.tar.bz2 nixlib-6cabce9abd916f219c1c003719f2e8ba547654c3.tar.lz nixlib-6cabce9abd916f219c1c003719f2e8ba547654c3.tar.xz nixlib-6cabce9abd916f219c1c003719f2e8ba547654c3.tar.zst nixlib-6cabce9abd916f219c1c003719f2e8ba547654c3.zip |
manual: rename users.extraUsers to users.users
Is called like this since 14321ae2431e33f5ed81f1ee43eddd29c7e9d01d, but docs were still using the old option in some cases. Reported-By: Cedric Shahabi <cedric.shahabi@gmail.com>
Diffstat (limited to 'nixos')
5 files changed, 5 insertions, 5 deletions
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 9cc7ca3e672a..9bb62bc2ece9 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -27,7 +27,7 @@ <screen> # nixos-container create foo --config ' <xref linkend="opt-services.openssh.enable"/> = true; - <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"]; + <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"]; ' </screen> </para> diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index e217a99148b9..c4ba63d801f5 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -19,7 +19,7 @@ All users that should have permission to change network settings must belong to the <code>networkmanager</code> group: <programlisting> -<link linkend="opt-users.users._name__.extraGroups">users.extraUsers.youruser.extraGroups</link> = [ "networkmanager" ]; +<link linkend="opt-users.users._name__.extraGroups">users.users.youruser.extraGroups</link> = [ "networkmanager" ]; </programlisting> </para> diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml index 6e883e3fbbc1..a4af1b96583d 100644 --- a/nixos/doc/manual/configuration/ssh.xml +++ b/nixos/doc/manual/configuration/ssh.xml @@ -20,7 +20,7 @@ follows: <!-- FIXME: this might not work if the user is unmanaged. --> <programlisting> -<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.alice.openssh.authorizedKeys.keys</link> = +<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.alice.openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; </programlisting> </para> diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 680160a3cb7e..1a116ec0b655 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -66,7 +66,7 @@ $ ./result/bin/run-*-vm <literal>mutableUsers = false</literal>. Another way is to temporarily add the following to your configuration: <screen> -<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.your-user.initialHashedPassword</link> = "test"; +<link linkend="opt-users.users._name__.initialHashedPassword">users.users.your-user.initialHashedPassword</link> = "test"; </screen> <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have started the virtual machine at least once without the right users, otherwise diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index c55aa90267fb..d1e49a2a1597 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -211,7 +211,7 @@ $ sudo groupdel nixbld</screen> use <literal>sudo</literal>) </para> <programlisting> -<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = ""; +<link linkend="opt-users.users._name__.initialHashedPassword">users.users.root.initialHashedPassword</link> = ""; </programlisting> </listitem> <listitem> |