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

Only add user to chroot when needed

Browse source
This commit is contained in:
jld3103 2021-08-08 18:18:36 +02:00
parent a3ab6a899d
commit bd751e539f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
chroot.py
View file

@ -29,6 +29,8 @@ def create_chroot(chroot_path, packages=['base'], pacman_conf='/app/local/etc/pa
logging.fatal('Failed to install system') logging.fatal('Failed to install system')
exit(1) exit(1)
def create_chroot_user(chroot_path):
user = 'kupfer' user = 'kupfer'
password = '123456' password = '123456'
groups = ['network', 'video', 'audio', 'optical', 'storage', groups = ['network', 'video', 'audio', 'optical', 'storage',
@ -42,8 +44,8 @@ def create_chroot(chroot_path, packages=['base'], pacman_conf='/app/local/etc/pa
f'chown {user}:{user} /home/{user} -R', f'chown {user}:{user} /home/{user} -R',
]) ])
result = subprocess.run(['arch-chroot', result = subprocess.run(['arch-chroot',
chroot_path, chroot_path,
'/bin/bash', '/bin/bash',
'-c', '-c',
install_script]) install_script])
if result.returncode != 0: if result.returncode != 0:

3
image.py
View file

@ -7,7 +7,7 @@ import subprocess
import time import time
import click import click
from logger import * from logger import *
from chroot import create_chroot from chroot import create_chroot, create_chroot_user
devices = { devices = {
'oneplus-enchilada': ['sdm845-oneplus-enchilada'], 'oneplus-enchilada': ['sdm845-oneplus-enchilada'],
@ -136,6 +136,7 @@ def cmd_build(verbose):
create_chroot(rootfs_mount, packages=(['base', 'base-kupfer'] + devices[device] + flavours[flavour]), pacman_conf='/app/local/etc/pacman.conf', extra_repos={'main': { create_chroot(rootfs_mount, packages=(['base', 'base-kupfer'] + devices[device] + flavours[flavour]), pacman_conf='/app/local/etc/pacman.conf', extra_repos={'main': {
'Server': 'https://gitlab.com/kupfer/packages/prebuilts/-/raw/main/$repo'}, 'device': {'Server': 'https://gitlab.com/kupfer/packages/prebuilts/-/raw/main/$repo'}}) 'Server': 'https://gitlab.com/kupfer/packages/prebuilts/-/raw/main/$repo'}, 'device': {'Server': 'https://gitlab.com/kupfer/packages/prebuilts/-/raw/main/$repo'}})
create_chroot_user(rootfs_mount)
""" """