| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | PKGBUILD/archinstall-bin/PKGBUILD | 2 | ||||
| -rw-r--r-- | PKGBUILD/archinstall/PKGBUILD | 2 | ||||
| -rw-r--r-- | PKGBUILD/python-archinstall/PKGBUILD | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | examples/guided.py | 19 |
diff --git a/PKGBUILD/archinstall-bin/PKGBUILD b/PKGBUILD/archinstall-bin/PKGBUILD index 55e97cf7..00b72b7b 100644 --- a/PKGBUILD/archinstall-bin/PKGBUILD +++ b/PKGBUILD/archinstall-bin/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se pkgname="archinstall-bin" -pkgver="2.0.6rc7" +pkgver="2.0.6rc8" pkgdesc="Installs a pre-built binary of ${pkgname}" pkgrel=1 url="https://github.com/Torxed/archinstall" diff --git a/PKGBUILD/archinstall/PKGBUILD b/PKGBUILD/archinstall/PKGBUILD index f412f8d2..c5164661 100644 --- a/PKGBUILD/archinstall/PKGBUILD +++ b/PKGBUILD/archinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Anton Hvornum <anton@hvornum.se> # Contributor: demostanis worlds <demostanis@protonmail.com> pkgname="archinstall" -pkgver="2.0.6rc7" +pkgver="2.0.6rc8" pkgdesc="Installs launcher scripts for archinstall" pkgrel=1 url="https://github.com/Torxed/archinstall" diff --git a/PKGBUILD/python-archinstall/PKGBUILD b/PKGBUILD/python-archinstall/PKGBUILD index 29a8b1a1..4bd9a115 100644 --- a/PKGBUILD/python-archinstall/PKGBUILD +++ b/PKGBUILD/python-archinstall/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: demostanis worlds <demostanis@protonmail.com> pkgname="python-archinstall" -pkgver="2.0.6rc7" +pkgver="2.0.6rc8" pkgdesc="Installs ${pkgname} as a python library." pkgrel=1 url="https://github.com/Torxed/archinstall" @@ -1 +1 @@ -2.0.6rc7
\ No newline at end of file +2.0.6rc8
\ No newline at end of file diff --git a/examples/guided.py b/examples/guided.py index a226ec1d..b5b54a85 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -49,21 +49,21 @@ def perform_installation(device, boot_partition, language, mirrors): installation.set_keyboard_language(language) installation.add_bootloader() - if len(packages) and packages[0] != '': - installation.add_additional_packages(packages) + if len(archinstall.storage['_guided']['packages']) and archinstall.storage['_guided']['packages'][0] != '': + installation.add_additional_packages(archinstall.storage['_guided']['packages']) - if profile and len(profile.strip()): - installation.install_profile(profile) + if archinstall.storage['_guided']['profile'] and len(archinstall.storage['_guided']['profile'].strip()): + installation.install_profile(archinstall.storage['_guided']['profile']) - for user, password in users.items(): + for user, password in archinstall.storage['_guided']['users'].items(): sudo = False - if len(root_pw.strip()) == 0: + if len(archinstall.storage['_guided_hidden']['root_pw'].strip()) == 0: sudo = True installation.user_create(user, password, sudo=sudo) - if root_pw: - installation.user_set_pw('root', root_pw) + if archinstall.storage['_guided_hidden']['root_pw']: + installation.user_set_pw('root', archinstall.storage['_guided_hidden']['root_pw']) # Unmount and close previous runs (in case the installer is restarted) archinstall.sys_command(f'umount -R /mnt', suppress_errors=True) @@ -81,6 +81,7 @@ archinstall.set_keyboard_language(keyboard_language) # Create a storage structure for all our information. # We'll print this right before the user gets informed about the formatting timer. archinstall.storage['_guided'] = {} +archinstall.storage['_guided_hidden'] = {} # This will simply be hidden from printouts and things. # Set which region to download packages from during the installation mirror_regions = archinstall.select_mirror_regions(archinstall.list_mirrors()) @@ -108,6 +109,8 @@ while (root_pw := getpass.getpass(prompt='Enter root password (leave blank to le if root_pw != root_pw_verification: archinstall.log(' * Passwords did not match * ', bg='black', fg='red') continue + + archinstall.storage['_guided_hidden']['root_pw'] = root_pw break # Ask for additional users (super-user if root pw was not set) |