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

Add hostname and locales as parameters to `minimal_installation()` (#1458)

This commit is contained in:
codefiles 2022-10-03 10:42:10 -04:00 committed by GitHub
parent 40e4046633
commit 977976f88e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -122,8 +122,7 @@ with archinstall.luks2(root, 'luksloop', disk_password) as unlocked_root:
boot.mount('/mnt/boot') boot.mount('/mnt/boot')
with archinstall.Installer('/mnt') as installation: with archinstall.Installer('/mnt') as installation:
if installation.minimal_installation(): if installation.minimal_installation(hostname='minimal-arch'):
installation.set_hostname('minimal-arch')
installation.add_bootloader() installation.add_bootloader()
installation.add_additional_packages(['nano', 'wget', 'git']) installation.add_additional_packages(['nano', 'wget', 'git'])

8
archinstall/lib/installer.py
View File

@ -662,7 +662,9 @@ class Installer:
return SysCommand(f'/usr/bin/arch-chroot {self.target} mkinitcpio {" ".join(flags)}').exit_code == 0 return SysCommand(f'/usr/bin/arch-chroot {self.target} mkinitcpio {" ".join(flags)}').exit_code == 0
def minimal_installation(self, testing=False, multilib=False) -> bool: def minimal_installation(
self, testing: bool = False, multilib: bool = False,
hostname: str = 'archinstall', locales: List[str] = ['en_US.UTF-8 UTF-8']) -> bool:
# Add necessary packages if encrypting the drive # Add necessary packages if encrypting the drive
# (encrypted partitions default to btrfs for now, so we need btrfs-progs) # (encrypted partitions default to btrfs for now, so we need btrfs-progs)
# TODO: Perhaps this should be living in the function which dictates # TODO: Perhaps this should be living in the function which dictates
@ -750,8 +752,8 @@ class Installer:
# os.remove(f'{self.target}/etc/localtime') # os.remove(f'{self.target}/etc/localtime')
# sys_command(f'/usr/bin/arch-chroot {self.target} ln -s /usr/share/zoneinfo/{localtime} /etc/localtime') # sys_command(f'/usr/bin/arch-chroot {self.target} ln -s /usr/share/zoneinfo/{localtime} /etc/localtime')
# sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime') # sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime')
self.set_hostname('archinstall') self.set_hostname(hostname)
self.set_locale('en_US') self.set_locale(*locales[0].split())
# TODO: Use python functions for this # TODO: Use python functions for this
SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root') SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root')

6
examples/guided.py
View File

@ -192,9 +192,9 @@ def perform_installation(mountpoint):
enable_testing = False enable_testing = False
enable_multilib = False enable_multilib = False
if installation.minimal_installation(testing=enable_testing, multilib=enable_multilib): if installation.minimal_installation(
installation.set_locale(archinstall.arguments['sys-language'], archinstall.arguments['sys-encoding'].upper()) testing=enable_testing, multilib=enable_multilib, hostname=archinstall.arguments['hostname'],
installation.set_hostname(archinstall.arguments['hostname']) locales=[f"{archinstall.arguments['sys-language']} {archinstall.arguments['sys-encoding'].upper()}"]):
if archinstall.arguments.get('mirror-region') is not None: if archinstall.arguments.get('mirror-region') is not None:
if archinstall.arguments.get("mirrors", None) is not None: if archinstall.arguments.get("mirrors", None) is not 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

6
examples/swiss.py
View File

@ -402,9 +402,9 @@ def os_setup(installation):
# Set mirrors used by pacstrap (outside of installation) # Set mirrors used by pacstrap (outside of installation)
if archinstall.arguments.get('mirror-region', None): if archinstall.arguments.get('mirror-region', None):
archinstall.use_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors for the live medium archinstall.use_mirrors(archinstall.arguments['mirror-region']) # Set the mirrors for the live medium
if installation.minimal_installation(): if installation.minimal_installation(
installation.set_locale(archinstall.arguments['sys-language'], archinstall.arguments['sys-encoding'].upper()) hostname=archinstall.arguments['hostname'],
installation.set_hostname(archinstall.arguments['hostname']) locales=[f"{archinstall.arguments['sys-language']} {archinstall.arguments['sys-encoding'].upper()}"]):
if archinstall.arguments['mirror-region'].get("mirrors", None) is not None: if archinstall.arguments['mirror-region'].get("mirrors", None) is not None:
installation.set_mirrors( installation.set_mirrors(
archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium archinstall.arguments['mirror-region']) # Set the mirrors in the installation medium