forked from Mirror/pmbootstrap
* Allow to specify a custom username in "pmbootstrap init" * Build chroots have "pmos" instead of "user" as username now * Installation user UID is 1000 now (as in all other Linux distributions) * Adjust autologins * postmarketos-base: enable wheel group for sudo, removed previous sudoers file * Implement safe upgrade path: We save the version of the work folder format now, in $WORK/version. When this file does not exist, it defaults to 0. In case it does not match the currently required version (pmb.config.work_version), then ask the user if it should automatically be upgraded.
This commit is contained in:
parent
75210b5cb5
commit
b4dd7a89d2
45 changed files with 229 additions and 106 deletions
|
@ -42,13 +42,13 @@ def init(args, suffix="native"):
|
|||
|
||||
# Generate package signing keys
|
||||
chroot = args.work + "/chroot_" + suffix
|
||||
if not os.path.exists(chroot + "/home/user/.abuild/abuild.conf"):
|
||||
if not os.path.exists(args.work + "/config_abuild/abuild.conf"):
|
||||
logging.info("(" + suffix + ") generate abuild keys")
|
||||
pmb.chroot.user(args, ["abuild-keygen", "-n", "-q", "-a"],
|
||||
suffix)
|
||||
|
||||
# Copy package signing key to /etc/apk/keys
|
||||
for key in glob.glob(chroot + "/home/user/.abuild/*.pub"):
|
||||
for key in glob.glob(chroot + "/home/pmos/.abuild/*.pub"):
|
||||
key = key[len(chroot):]
|
||||
pmb.chroot.root(args, ["cp", key, "/etc/apk/keys/"], suffix)
|
||||
|
||||
|
@ -75,7 +75,7 @@ def init(args, suffix="native"):
|
|||
pmb.chroot.root(args, ["chmod", "+x", "/usr/local/bin/gzip"], suffix)
|
||||
|
||||
# Add user to group abuild
|
||||
pmb.chroot.root(args, ["adduser", "user", "abuild"], suffix)
|
||||
pmb.chroot.root(args, ["adduser", "pmos", "abuild"], suffix)
|
||||
|
||||
# abuild.conf: Don't clean the build folder after building, so we can
|
||||
# inspect it afterwards for debugging
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue