RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missed a merge

This commit is contained in:
advaithm 2021-04-14 14:16:11 +05:30
parent efd23e67d6
commit 85bcc58951
No known key found for this signature in database
GPG Key ID: E557E45E6DAFFC0C
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/guided.py
View File

@ -291,16 +291,8 @@ def perform_installation(mountpoint):
if installation.minimal_installation(): if installation.minimal_installation():
installation.set_hostname(archinstall.arguments['hostname']) installation.set_hostname(archinstall.arguments['hostname'])
<<<<<<< HEAD
if archinstall.arguments['mirror-region'] != None: if archinstall.arguments['mirror-region'] != None:
installation.set_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium installation.set_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium
=======
# Configure the selected mirrors in the installation
if archinstall.arguments.get('mirror-region', None):
installation.set_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium
>>>>>>> af2671c1ec1ac2ecbdbd35c90c3e5016dcf516ed
installation.set_keyboard_language(archinstall.arguments['keyboard-language']) installation.set_keyboard_language(archinstall.arguments['keyboard-language'])
installation.add_bootloader() installation.add_bootloader()