parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

chroot: add chroot.get_uid(user: str), use in chroot.mount_{ccache,rust} to apply correct ownership

Browse source
This commit is contained in:
InsanePrawn 2022-08-29 20:12:09 +02:00
parent 035e197f64
commit 6cce302dcc
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
chroot/abstract.py
View file

@ -346,6 +346,18 @@ class Chroot(AbstractChroot):
if result.returncode != 0: if result.returncode != 0:
raise Exception(f'Failed to setup user {user} in self.name') raise Exception(f'Failed to setup user {user} in self.name')
def get_uid(self, user: Union[str, int]) -> int:
if isinstance(user, int):
return user
if user == 'root':
return 0
res = self.run_cmd(['id', '-u', user], capture_output=True)
assert isinstance(res, subprocess.CompletedProcess)
if res.returncode or not res.stdout:
raise Exception(f"chroot {self.name}: Couldnt detect uid for user {user}: {repr(res.stdout)}")
uid = res.stdout.decode()
return int(uid)
def add_sudo_config(self, config_name: str = 'wheel', privilegee: str = '%wheel', password_required: bool = True): def add_sudo_config(self, config_name: str = 'wheel', privilegee: str = '%wheel', password_required: bool = True):
if '.' in config_name: if '.' in config_name:
raise Exception(f"won't create sudoers.d file {config_name} since it will be ignored by sudo because it contains a dot!") raise Exception(f"won't create sudoers.d file {config_name} since it will be ignored by sudo because it contains a dot!")

6
chroot/build.py
View file

@ -135,7 +135,8 @@ class BuildChroot(Chroot):
def mount_ccache(self, user: str = 'kupfer', fail_if_mounted: bool = False): def mount_ccache(self, user: str = 'kupfer', fail_if_mounted: bool = False):
mount_source = os.path.join(config.file.paths.ccache, self.arch) mount_source = os.path.join(config.file.paths.ccache, self.arch)
mount_dest = os.path.join(f'/home/{user}' if user != 'root' else '/root', '.ccache') mount_dest = os.path.join(f'/home/{user}' if user != 'root' else '/root', '.ccache')
makedir(mount_source) uid = self.get_uid(user)
makedir(mount_source, user=uid)
return self.mount( return self.mount(
absolute_source=mount_source, absolute_source=mount_source,
relative_destination=mount_dest, relative_destination=mount_dest,
@ -144,11 +145,12 @@ class BuildChroot(Chroot):
def mount_rust(self, user: str = 'kupfer', fail_if_mounted: bool = False) -> list[str]: def mount_rust(self, user: str = 'kupfer', fail_if_mounted: bool = False) -> list[str]:
results = [] results = []
uid = self.get_uid(user)
mount_source_base = config.file.paths.rust # apparently arch-agnostic mount_source_base = config.file.paths.rust # apparently arch-agnostic
for rust_dir in ['cargo', 'rustup']: for rust_dir in ['cargo', 'rustup']:
mount_source = os.path.join(mount_source_base, rust_dir) mount_source = os.path.join(mount_source_base, rust_dir)
mount_dest = os.path.join(f'/home/{user}' if user != 'root' else '/root', f'.{rust_dir}') mount_dest = os.path.join(f'/home/{user}' if user != 'root' else '/root', f'.{rust_dir}')
makedir(mount_source) makedir(mount_source, user=uid)
results.append(self.mount( results.append(self.mount(
absolute_source=mount_source, absolute_source=mount_source,
relative_destination=mount_dest, relative_destination=mount_dest,