From bd751e539f4f8368a542d3a5b2d01005b729cfad Mon Sep 17 00:00:00 2001
From: jld3103 <jld3103yt@gmail.com>
Date: Sun, 8 Aug 2021 18:18:36 +0200
Subject: [PATCH] Only add user to chroot when needed

---
 chroot.py | 6 ++++--
 image.py  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/chroot.py b/chroot.py
index d9fb6c9..9d9dace 100644
--- a/chroot.py
+++ b/chroot.py
@@ -29,6 +29,8 @@ def create_chroot(chroot_path, packages=['base'], pacman_conf='/app/local/etc/pa
         logging.fatal('Failed to install system')
         exit(1)
 
+
+def create_chroot_user(chroot_path):
     user = 'kupfer'
     password = '123456'
     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',
     ])
     result = subprocess.run(['arch-chroot',
-                             chroot_path,
-                             '/bin/bash',
+                            chroot_path,
+                            '/bin/bash',
                              '-c',
                              install_script])
     if result.returncode != 0:
diff --git a/image.py b/image.py
index ced48e6..fdfacc4 100644
--- a/image.py
+++ b/image.py
@@ -7,7 +7,7 @@ import subprocess
 import time
 import click
 from logger import *
-from chroot import create_chroot
+from chroot import create_chroot, create_chroot_user
 
 devices = {
     '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': {
                   '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)
 
 
 """