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

Enabled skipping partitioning in minimal. It now can take /mnt just as guided as it's destination, and skips partitioning all together. Which makes it go straight to installation.

This commit is contained in:
Anton Hvornum 2021-04-09 22:08:33 +02:00
parent 97540293b8
commit 0370c44ed8
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
examples/minimal.py
View File

@ -10,7 +10,6 @@ if archinstall.arguments.get('help', None):
archinstall.log(f" - Optional systemd network via --network") archinstall.log(f" - Optional systemd network via --network")
archinstall.arguments['harddrive'] = archinstall.select_disk(archinstall.all_disks()) archinstall.arguments['harddrive'] = archinstall.select_disk(archinstall.all_disks())
archinstall.arguments['harddrive'].keep_partitions = False
def install_on(mountpoint): def install_on(mountpoint):
# We kick off the installer by telling it where the # We kick off the installer by telling it where the
@ -37,32 +36,36 @@ def install_on(mountpoint):
archinstall.log(f" * root (password: airoot)") archinstall.log(f" * root (password: airoot)")
archinstall.log(f" * devel (password: devel)") archinstall.log(f" * devel (password: devel)")
print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='') if archinstall.arguments['harddrive']:
archinstall.do_countdown() archinstall.arguments['harddrive'].keep_partitions = False
print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='')
archinstall.do_countdown()
# First, we configure the basic filesystem layout # First, we configure the basic filesystem layout
with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs: with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
# We use the entire disk instead of setting up partitions on your own # We use the entire disk instead of setting up partitions on your own
if archinstall.arguments['harddrive'].keep_partitions is False: if archinstall.arguments['harddrive'].keep_partitions is False:
fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs')) fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
boot = fs.find_partition('/boot') boot = fs.find_partition('/boot')
root = fs.find_partition('/') root = fs.find_partition('/')
boot.format('vfat') boot.format('vfat')
# We encrypt the root partition if we got a password to do so with, # We encrypt the root partition if we got a password to do so with,
# Otherwise we just skip straight to formatting and installation # Otherwise we just skip straight to formatting and installation
if archinstall.arguments.get('!encryption-password', None): if archinstall.arguments.get('!encryption-password', None):
root.encrypted = True root.encrypted = True
root.encrypt(password=archinstall.arguments.get('!encryption-password', None)) root.encrypt(password=archinstall.arguments.get('!encryption-password', None))
with archinstall.luks2(root, 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_root: with archinstall.luks2(root, 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_root:
unlocked_root.format(root.filesystem) unlocked_root.format(root.filesystem)
unlocked_root.mount('/mnt') unlocked_root.mount('/mnt')
else: else:
root.format(root.filesystem) root.format(root.filesystem)
root.mount('/mnt') root.mount('/mnt')
boot.mount('/mnt/boot') boot.mount('/mnt/boot')
install_on('/mnt')
install_on('/mnt')