Fix for #61. Variable mix-matches should be fixed and tested now. There's also slightly better debug output to show where the issue is rather than just 'AttributeError'.
This commit is contained in:
parent
decf9119f2
commit
e43a84bb4b
|
|
@ -1,7 +1,7 @@
|
||||||
# Maintainer: Anton Hvornum anton@hvornum.se
|
# Maintainer: Anton Hvornum anton@hvornum.se
|
||||||
# Contributor: Anton Hvornum anton@hvornum.se
|
# Contributor: Anton Hvornum anton@hvornum.se
|
||||||
pkgname="archinstall-bin"
|
pkgname="archinstall-bin"
|
||||||
pkgver="2.0.6rc15"
|
pkgver="2.0.6rc16"
|
||||||
pkgdesc="Installs a pre-built binary of ${pkgname}"
|
pkgdesc="Installs a pre-built binary of ${pkgname}"
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url="https://github.com/Torxed/archinstall"
|
url="https://github.com/Torxed/archinstall"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Maintainer: Anton Hvornum <anton@hvornum.se>
|
# Maintainer: Anton Hvornum <anton@hvornum.se>
|
||||||
# Contributor: demostanis worlds <demostanis@protonmail.com>
|
# Contributor: demostanis worlds <demostanis@protonmail.com>
|
||||||
pkgname="archinstall"
|
pkgname="archinstall"
|
||||||
pkgver="2.0.6rc15"
|
pkgver="2.0.6rc16"
|
||||||
pkgdesc="Installs launcher scripts for archinstall"
|
pkgdesc="Installs launcher scripts for archinstall"
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url="https://github.com/Torxed/archinstall"
|
url="https://github.com/Torxed/archinstall"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
# Contributor: demostanis worlds <demostanis@protonmail.com>
|
# Contributor: demostanis worlds <demostanis@protonmail.com>
|
||||||
|
|
||||||
pkgname="python-archinstall"
|
pkgname="python-archinstall"
|
||||||
pkgver="2.0.6rc15"
|
pkgver="2.0.6rc16"
|
||||||
pkgdesc="Installs ${pkgname} as a python library."
|
pkgdesc="Installs ${pkgname} as a python library."
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url="https://github.com/Torxed/archinstall"
|
url="https://github.com/Torxed/archinstall"
|
||||||
|
|
|
||||||
|
|
@ -57,14 +57,14 @@ def perform_installation(device, boot_partition, language, mirrors):
|
||||||
|
|
||||||
for user in archinstall.storage['_guided']['users']:
|
for user in archinstall.storage['_guided']['users']:
|
||||||
password = users[user]
|
password = users[user]
|
||||||
|
|
||||||
sudo = False
|
sudo = False
|
||||||
if len(archinstall.storage['_guided_hidden']['root_pw'].strip()) == 0:
|
if 'root_pw' not in archinstall.storage['_guided_hidden'] or len(archinstall.storage['_guided_hidden']['root_pw'].strip()) == 0:
|
||||||
sudo = True
|
sudo = True
|
||||||
|
|
||||||
installation.user_create(user, password, sudo=sudo)
|
installation.user_create(user, password, sudo=sudo)
|
||||||
|
|
||||||
if archinstall.storage['_guided_hidden']['root_pw']:
|
if 'root_pw' in archinstall.storage['_guided_hidden'] and archinstall.storage['_guided_hidden']['root_pw']:
|
||||||
installation.user_set_pw('root', 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)
|
# Unmount and close previous runs (in case the installer is restarted)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue