1 |
commit: a6522008e915abbbf7cddc057c9f7951e7d667a6 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 8 21:11:13 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 2 23:50:27 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a6522008 |
7 |
|
8 |
example: document new options |
9 |
|
10 |
Closes: https://bugs.gentoo.org/236905 |
11 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
13 |
|
14 |
examples/stage4_template.spec | 34 ++++++++++++++++++++++++++++------ |
15 |
1 file changed, 28 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec |
18 |
index 5fbf6a50..5d9a390c 100644 |
19 |
--- a/examples/stage4_template.spec |
20 |
+++ b/examples/stage4_template.spec |
21 |
@@ -171,15 +171,37 @@ stage4/root_overlay: |
22 |
# stage4/xinitrc: |
23 |
stage4/xinitrc: |
24 |
|
25 |
-# This option is used to create non-root users on your CD. It takes a space |
26 |
-# separated list of user names. These users will be added to the following |
27 |
-# groups: users,wheel,audio,games,cdrom,usb |
28 |
-# If this is specified in your spec file, then the first user is also the user |
29 |
-# used to start X. Since this is not used on the release media, it is blank. |
30 |
-# example: |
31 |
+# This option is used to create groups. It takes a carriage-return separated |
32 |
+# list of group names. For instance: |
33 |
+# stage4/groups: |
34 |
+# admin |
35 |
+# web_group |
36 |
+# sudo_group |
37 |
+stage4/groups: |
38 |
+ |
39 |
+# This option is used to create non-root users. It takes a carriage-return |
40 |
+# separated list of user names. For instance: |
41 |
+# stage4/users: |
42 |
+# john.doe |
43 |
+# foo.bar |
44 |
+# |
45 |
+# These users are NOT added to any specific group. You can specify one |
46 |
+# or more groups to add the user(s) to using an equal sign followed by a comma |
47 |
+# separated list. For instance: |
48 |
# stage4/users: |
49 |
+# john.doe=wheel,audio,cdrom |
50 |
+# foo.bar=www,audio |
51 |
stage4/users: |
52 |
|
53 |
+# This option is used to copy an SSH public key into a user's .ssh directory. |
54 |
+# Catalyst will copy the SSH public key in the ~/.ssh/authorized_keys file and |
55 |
+# set the file permission to 0644. It takes a carriage-return separated list of |
56 |
+# users with a equal sign followed by the SSH public key path. For instance: |
57 |
+# stage4/ssh_public_keys: |
58 |
+# john.doe=/path/to/johns/public/key/id_rsa.pub |
59 |
+# foo.bar=/path/to/foos/public/key/id_ed25519.pub |
60 |
+stage4/ssh_public_keys: |
61 |
+ |
62 |
# This option is used to specify the number of kernels to build and also the |
63 |
# labels that will be used by the CD bootloader to refer to each kernel image. |
64 |
# example: |