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 AFCA515808B for ; Sun, 27 Mar 2022 23:37:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8FD2E097A; Sun, 27 Mar 2022 23:37:22 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 DF5DEE097A for ; Sun, 27 Mar 2022 23:37:22 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id x2so13361556plm.7 for ; Sun, 27 Mar 2022 16:37:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KksNmEcQJTothr8AO83EGo4cTcNT1M6QzYmAsm5ho8o=; b=UDvc2H2jsMnZdlbkPnoNRCw6Cu5fZvldScYe9g1nCGGvfrV7bHtCrcw7Rkcx10OYVe lAeP8pY43az8sL2lXYjd9TPXZWjk1yWvKus82iodxlm8jNViMDzbN8emYJZHlvmSUKDb oRpLnM8kgXqRr708jNAlXbet71rdp3kn/43WlFEMiVfErpSj50t0lL/PA6KWZghJ9oxG HCaJWAmW/QmQkKo3BzshNZ3DDFzrHItH+fi73feJLomSfhwnwkbSImZsqDVRfANhDwRw nFEoFjZR61WmgLyA6LU3GNxmp3dTjri4JgjIrgNbrqF9vU6kHMP8m+85o6M+N1w0HdMB XvKg== X-Gm-Message-State: AOAM532EpXhNW0sqJrpyQfWYYN0D91GyxcvujyZpH00RqC3yi1BwccH1 m/8gtBVSHLffy8iExRBXKFZZqF0bFD0= X-Google-Smtp-Source: ABdhPJy1BT0R3an42T3XBNPqK5TA4M93lAvEnT4LjrqkE3BFvtxq5lX7guVnKDethZ3vZ812kPaCSA== X-Received: by 2002:a17:902:f70b:b0:14d:643d:9c99 with SMTP id h11-20020a170902f70b00b0014d643d9c99mr23959414plo.18.1648424241522; Sun, 27 Mar 2022 16:37:21 -0700 (PDT) Received: from localhost ([199.247.115.17]) by smtp.gmail.com with ESMTPSA id gd10-20020a17090b0fca00b001c75d6a4b18sm12264855pjb.14.2022.03.27.16.37.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 16:37:20 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Patrice Clement Subject: [gentoo-catalyst] [PATCH 3/3] example: document new options Date: Sun, 27 Mar 2022 16:37:12 -0700 Message-Id: <20220327233712.1282001-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220327233712.1282001-1-mattst88@gentoo.org> References: <20220327233712.1282001-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 959c96fc-1dfd-4e10-8fa8-e3c52cea2102 X-Archives-Hash: 14987b6f3ffe402a32393a126c0fc63d From: Patrice Clement Closes: https://bugs.gentoo.org/236905 Signed-off-by: Patrice Clement --- 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: -- 2.34.1