BigfootACA/arch-image-builder
1
0
Fork 0
mirror of https://github.com/BigfootACA/arch-image-builder.git synced 2024-09-21 15:20:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: BigfootACA:be0624f9475caf11dbd61e360fe1f426c8e16514
Branches Tags
BigfootACA:master
...
compare: BigfootACA:3a5b7d74ada53615b0eb564271752b2eb489448f
Branches Tags
BigfootACA:master

2 Commits
be0624f947 ... 3a5b7d74ad

Author SHA1 Message Date
BigfootACA
3a5b7d74ad builder: build: bootstrap.py: reload user database before filesystem 
Signed-off-by: BigfootACA <bigfoot@classfun.cn>
 2024-05-31 18:21:28 +08:00
BigfootACA
9b621831c4 builder: component: user.py: gid fallback to uid when user is not found 
Signed-off-by: BigfootACA <bigfoot@classfun.cn>
 2024-05-31 18:20:57 +08:00
2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

6
builder/build/bootstrap.py
View File

@ -112,12 +112,12 @@ def build_rootfs(ctx: ArchBuilderContext):
# real install all packages # real install all packages
pacman_build.proc_pacman(ctx, pacman) pacman_build.proc_pacman(ctx, pacman)
# running add files hooks (for user settings)
filesystem.add_files_all(ctx, "pre-user")
# reload user databases after install packages # reload user databases after install packages
ctx.reload_passwd() ctx.reload_passwd()
# running add files hooks (for user settings)
filesystem.add_files_all(ctx, "pre-user")
# create custom users and groups # create custom users and groups
user.proc_usergroup(ctx) user.proc_usergroup(ctx)

5
builder/component/user.py
View File

@ -71,8 +71,5 @@ def parse_user_from(
gid = parse_usergroup_from(ctx, node, True, gid) gid = parse_usergroup_from(ctx, node, True, gid)
if gid == -1: if gid == -1:
user = ctx.passwd.lookup_uid(uid) user = ctx.passwd.lookup_uid(uid)
if user is None: raise ArchBuilderConfigError( gid = user.gid if user else uid
f"user {user} not found"
)
gid = user.gid
return uid, gid return uid, gid