From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 515BD15808B for ; Sat, 2 Apr 2022 23:50:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D75FEE086A; Sat, 2 Apr 2022 23:50:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B65B8E08AD for ; Sat, 2 Apr 2022 23:50:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3EAC53411E1 for ; Sat, 2 Apr 2022 23:50:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5ADB361 for ; Sat, 2 Apr 2022 23:50:45 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1648943427.a6522008e915abbbf7cddc057c9f7951e7d667a6.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: examples/ X-VCS-Repository: proj/catalyst X-VCS-Files: examples/stage4_template.spec X-VCS-Directories: examples/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a6522008e915abbbf7cddc057c9f7951e7d667a6 X-VCS-Branch: master Date: Sat, 2 Apr 2022 23:50:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0c205100-7995-42d1-9cd5-44f86fe2caa9 X-Archives-Hash: 61bab7176d6742b422ad5ee905a502d4 Message-ID: <20220402235045.85TU6X8-piLh0yoslwqLkHdN2u_8BYDHZ_fYe8-osMQ@z> commit: a6522008e915abbbf7cddc057c9f7951e7d667a6 Author: Patrice Clement gentoo org> AuthorDate: Tue Mar 8 21:11:13 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Apr 2 23:50:27 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a6522008 example: document new options Closes: https://bugs.gentoo.org/236905 Signed-off-by: Patrice Clement gentoo.org> Signed-off-by: Matt Turner gentoo.org> examples/stage4_template.spec | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec index 5fbf6a50..5d9a390c 100644 --- a/examples/stage4_template.spec +++ b/examples/stage4_template.spec @@ -171,15 +171,37 @@ stage4/root_overlay: # stage4/xinitrc: stage4/xinitrc: -# This option is used to create non-root users on your CD. It takes a space -# separated list of user names. These users will be added to the following -# groups: users,wheel,audio,games,cdrom,usb -# If this is specified in your spec file, then the first user is also the user -# used to start X. Since this is not used on the release media, it is blank. -# example: +# This option is used to create groups. It takes a carriage-return separated +# list of group names. For instance: +# stage4/groups: +# admin +# web_group +# sudo_group +stage4/groups: + +# This option is used to create non-root users. It takes a carriage-return +# separated list of user names. For instance: +# stage4/users: +# john.doe +# foo.bar +# +# These users are NOT added to any specific group. You can specify one +# or more groups to add the user(s) to using an equal sign followed by a comma +# separated list. For instance: # stage4/users: +# john.doe=wheel,audio,cdrom +# foo.bar=www,audio stage4/users: +# This option is used to copy an SSH public key into a user's .ssh directory. +# Catalyst will copy the SSH public key in the ~/.ssh/authorized_keys file and +# set the file permission to 0644. It takes a carriage-return separated list of +# users with a equal sign followed by the SSH public key path. For instance: +# stage4/ssh_public_keys: +# john.doe=/path/to/johns/public/key/id_rsa.pub +# foo.bar=/path/to/foos/public/key/id_ed25519.pub +stage4/ssh_public_keys: + # This option is used to specify the number of kernels to build and also the # labels that will be used by the CD bootloader to refer to each kernel image. # example: