From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
Date: Sat, 2 Apr 2022 23:50:45 +0000 (UTC) [thread overview]
Message-ID: <1648943416.5be6069bcbd5a7fa3f114f28366597bc5ddbb891.mattst88@gentoo> (raw)
commit: 5be6069bcbd5a7fa3f114f28366597bc5ddbb891
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 21:02:55 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 23:50:16 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5be6069b
catalyst: support 3 new options
* stage4/groups: create a a list of groups.
* stage4/users: create a list of users. users can also be added to
groups using the "foo.bar=wheel,audio,baz" format.
* stage4/ssh_public_keys: copy an SSH public key into the stage4 user's home
(.ssh/authorized_keys) and set the file permission to 0644.
Bug: https://bugs.gentoo.org/236905
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 70 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index de1e30ef..76feb5f0 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -201,6 +201,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.set_packages()
self.set_rm()
self.set_linuxrc()
+ self.set_groups()
+ self.set_users()
+ self.set_ssh_public_keys()
self.set_busybox_config()
self.set_overlay()
self.set_repos()
@@ -583,6 +586,39 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings[self.settings["spec_prefix"] + "/linuxrc"]
del self.settings[self.settings["spec_prefix"] + "/linuxrc"]
+ def set_groups(self):
+ groups = self.settings["spec_prefix"] + "/groups"
+ if groups in self.settings:
+ if isinstance(self.settings[groups], str):
+ self.settings["groups"] = self.settings[groups].split(",")
+ self.settings["groups"] = self.settings[groups]
+ del self.settings[groups]
+ else:
+ self.settings["groups"] = []
+ log.info('groups to create: %s' % self.settings["groups"])
+
+ def set_users(self):
+ users = self.settings["spec_prefix"] + "/users"
+ if users in self.settings:
+ if isinstance(self.settings[users], str):
+ self.settings["users"] = self.settings[users].split(",")
+ self.settings["users"] = self.settings[users]
+ del self.settings[users]
+ else:
+ self.settings["users"] = []
+ log.info('users to create: %s' % self.settings["users"])
+
+ def set_ssh_public_keys(self):
+ ssh_public_keys = self.settings["spec_prefix"] + "/ssh_public_keys"
+ if ssh_public_keys in self.settings:
+ if isinstance(self.settings[ssh_public_keys], str):
+ self.settings["ssh_public_keys"] = self.settings[ssh_public_keys].split(",")
+ self.settings["ssh_public_keys"] = self.settings[ssh_public_keys]
+ del self.settings[ssh_public_keys]
+ else:
+ self.settings["ssh_public_keys"] = []
+ log.info('ssh public keys to copy: %s' % self.settings["ssh_public_keys"])
+
def set_busybox_config(self):
if self.settings["spec_prefix"] + "/busybox_config" in self.settings:
if isinstance(self.settings[self.settings['spec_prefix'] + '/busybox_config'], str):
@@ -894,6 +930,40 @@ class StageBase(TargetBase, ClearBase, GenBase):
cmd(['rsync', '-a', x + '/', self.settings['stage_path']],
env=self.env)
+ def groups(self):
+ for x in self.settings["groups"].split():
+ log.notice("Creating group: '%s'", x)
+ cmd(["groupadd", "-R", self.settings['chroot_path'], x], env=self.env)
+
+ def users(self):
+ for x in self.settings["users"]:
+ usr, grp = '', ''
+ try:
+ usr, grp = x.split("=")
+ except ValueError:
+ usr = x
+ log.debug("users: '=' separator not found on line " + x)
+ log.debug("users: missing separator means no groups found")
+ uacmd = ["useradd", "-R", self.settings['chroot_path'], "-m", x]
+ if grp != '':
+ uacmd = ["useradd", "-R", self.settings['chroot_path'], "-m", "-G", grp, usr]
+ log.notice("Creating user: '%s'", f"{usr}={grp}")
+ cmd(uacmd, env=self.env)
+
+ def ssh_public_keys(self):
+ for x in self.settings["ssh_public_keys"]:
+ usr, pub_key_src = '', ''
+ try:
+ usr, pub_key_src = x.split("=")
+ except ValueError:
+ raise CatalystError(f"ssh_public_keys: '=' separator not found on line {x}")
+ log.notice("Copying SSH public key for user: '%s'", usr)
+ pub_key_dest = self.settings['chroot_path'] + f"/home/{usr}/.ssh/authorized_keys"
+ cpcmd = ["cp", "-av", pub_key_src, pub_key_dest]
+ cmd(cpcmd, env=self.env)
+ chcmd = ["chmod", "0644", pub_key_dest]
+ cmd(chcmd, env=self.env)
+
def bind(self):
for x in [x for x in self.mount if self.mount[x]['enable']]:
if str(self.mount[x]['source']) == 'config':
next reply other threads:[~2022-04-02 23:50 UTC|newest]
Thread overview: 143+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-02 23:50 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-22 18:39 [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ Ben Kohler
2024-08-03 9:06 Andreas K. Hüttel
2024-07-30 14:12 Andreas K. Hüttel
2024-07-30 11:06 Andreas K. Hüttel
2024-07-30 11:06 Andreas K. Hüttel
2024-06-09 16:50 Andreas K. Hüttel
2024-06-07 21:45 Matt Turner
2024-03-03 18:50 Andreas K. Hüttel
2023-12-24 21:42 Andreas K. Hüttel
2023-09-05 1:44 Andreas K. Hüttel
2023-07-01 19:27 Andreas K. Hüttel
2023-05-10 18:10 Ben Kohler
2022-11-22 21:19 Matt Turner
2022-11-20 0:21 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2022-04-20 23:26 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2022-11-20 0:21 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2022-05-13 17:45 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2022-11-14 14:11 Andreas K. Hüttel
2022-11-13 2:18 Andreas K. Hüttel
2022-05-13 17:45 Matt Turner
2022-05-13 17:45 Matt Turner
2022-05-13 17:43 [gentoo-commits] proj/catalyst:stage4-user-groups-fixes " Matt Turner
2022-05-13 17:45 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-06-10 0:48 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-03-09 16:18 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-06-10 0:48 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-02-21 2:05 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-06-10 0:48 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-03-25 3:03 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-06-10 0:48 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-02-20 21:27 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-03-25 3:03 Matt Turner
2021-03-06 16:58 Matt Turner
2021-01-28 2:41 Matt Turner
2021-01-28 2:41 Matt Turner
2021-01-28 2:09 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2021-01-28 2:41 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-12-27 23:15 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-30 22:41 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-30 22:41 Matt Turner
2020-10-30 22:41 Matt Turner
2020-10-24 22:07 Matt Turner
2020-10-24 22:07 Matt Turner
2020-10-14 17:48 Matt Turner
2020-08-15 21:11 Matt Turner
2020-07-24 20:33 Andreas K. Hüttel
2020-07-20 20:40 Andreas K. Hüttel
2020-06-05 21:13 Matt Turner
2020-06-05 21:13 Matt Turner
2020-06-05 21:13 Matt Turner
2020-05-21 20:25 Matt Turner
2020-05-21 20:25 Matt Turner
2020-05-21 20:25 Matt Turner
2020-05-20 3:39 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-05-21 20:25 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-05-16 6:43 Matt Turner
2020-05-16 6:43 Matt Turner
2020-05-15 6:32 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-05-16 6:43 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-05-15 6:32 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-05-16 6:43 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-05-06 17:41 Matt Turner
2020-05-05 5:20 Matt Turner
2020-05-01 5:57 Matt Turner
2020-04-30 22:56 Matt Turner
2020-04-23 2:06 Matt Turner
2020-04-22 5:52 Matt Turner
2020-04-18 20:30 Matt Turner
2020-04-17 19:52 Matt Turner
2020-04-17 19:52 Matt Turner
2020-04-17 19:52 Matt Turner
2020-04-17 19:52 Matt Turner
2020-04-15 19:59 Matt Turner
2020-04-13 20:43 Matt Turner
2020-04-13 20:43 Matt Turner
2020-04-13 20:43 Matt Turner
2020-04-13 20:36 Matt Turner
2020-04-13 20:36 Matt Turner
2020-04-13 20:36 Matt Turner
2020-04-10 21:04 Matt Turner
2020-04-10 5:38 Matt Turner
2020-04-10 2:11 Matt Turner
2020-03-29 17:48 Matt Turner
2020-03-28 20:07 Matt Turner
2019-10-19 23:25 Matt Turner
2019-10-14 20:15 Matt Turner
2019-10-05 22:31 Matt Turner
2018-11-07 19:50 Rick Farina
2018-10-01 16:30 Brian Dolbec
2018-07-21 18:54 Brian Dolbec
2018-07-21 18:54 Brian Dolbec
2018-02-22 3:53 Richard Farina
2018-02-22 3:50 Richard Farina
2017-12-29 2:27 Brian Dolbec
2017-12-29 2:27 Brian Dolbec
2017-12-29 0:35 Brian Dolbec
2017-11-29 17:20 Brian Dolbec
2017-11-29 17:20 Brian Dolbec
2017-11-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2017-11-29 17:20 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2017-03-09 5:38 Brian Dolbec
2017-03-09 5:05 Brian Dolbec
2017-03-08 23:16 Brian Dolbec
2017-03-08 23:16 Brian Dolbec
2016-09-19 3:27 Brian Dolbec
2016-06-25 15:46 Brian Dolbec
2016-05-22 3:34 Mike Frysinger
2016-05-20 3:03 Mike Frysinger
2016-03-24 14:37 Brian Dolbec
2016-03-23 21:15 Brian Dolbec
2016-03-21 4:55 Mike Frysinger
2016-03-17 5:04 Brian Dolbec
2016-02-17 8:17 Brian Dolbec
2016-02-11 16:43 Mike Frysinger
2016-02-11 13:59 Mike Frysinger
2015-12-23 4:30 Brian Dolbec
2015-12-20 4:47 Brian Dolbec
2015-12-20 1:13 Brian Dolbec
2015-12-15 17:13 Brian Dolbec
2015-11-21 1:33 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-11-10 6:42 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-11-20 21:26 Brian Dolbec
2015-11-09 4:47 Brian Dolbec
2015-10-31 20:35 Brian Dolbec
2015-10-31 20:35 Brian Dolbec
2015-10-28 16:50 Mike Frysinger
2015-10-27 21:43 Richard Farina
2015-10-24 6:58 Mike Frysinger
2015-10-24 6:58 Mike Frysinger
2015-10-11 18:03 Mike Frysinger
2015-10-11 17:26 Mike Frysinger
2015-10-11 17:26 Mike Frysinger
2015-10-11 17:26 Mike Frysinger
2015-10-09 2:40 Mike Frysinger
2015-10-06 17:03 Mike Frysinger
2015-10-06 15:31 Mike Frysinger
2015-10-06 13:46 Mike Frysinger
2015-09-08 14:21 Richard Farina
2015-09-08 14:17 Brian Dolbec
2015-09-08 14:17 Brian Dolbec
2015-09-08 14:14 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-09-08 14:17 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-09-06 21:18 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-09-06 21:21 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-09-03 15:14 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-09-02 21:00 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-09-02 21:52 Richard Farina
2015-09-02 21:25 Richard Farina
2015-09-01 19:41 Richard Farina
2015-08-31 19:21 Richard Farina
2015-05-24 0:08 Brian Dolbec
2015-05-24 0:08 Brian Dolbec
2015-05-24 0:08 Brian Dolbec
2015-05-21 23:53 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-05-24 0:08 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-05-21 23:53 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-05-24 0:08 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-05-21 23:53 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-05-24 0:08 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2015-02-26 22:18 Brian Dolbec
2015-01-01 5:59 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-02-26 20:12 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1648943416.5be6069bcbd5a7fa3f114f28366597bc5ddbb891.mattst88@gentoo \
--to=mattst88@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox