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:
parent
97540293b8
commit
0370c44ed8
|
|
@ -10,7 +10,6 @@ if archinstall.arguments.get('help', None):
|
|||
archinstall.log(f" - Optional systemd network via --network")
|
||||
|
||||
archinstall.arguments['harddrive'] = archinstall.select_disk(archinstall.all_disks())
|
||||
archinstall.arguments['harddrive'].keep_partitions = False
|
||||
|
||||
def install_on(mountpoint):
|
||||
# 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" * devel (password: devel)")
|
||||
|
||||
print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='')
|
||||
archinstall.do_countdown()
|
||||
if archinstall.arguments['harddrive']:
|
||||
archinstall.arguments['harddrive'].keep_partitions = False
|
||||
|
||||
print(f" ! Formatting {archinstall.arguments['harddrive']} in ", end='')
|
||||
archinstall.do_countdown()
|
||||
|
||||
# First, we configure the basic filesystem layout
|
||||
with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
|
||||
# We use the entire disk instead of setting up partitions on your own
|
||||
if archinstall.arguments['harddrive'].keep_partitions is False:
|
||||
fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
|
||||
# First, we configure the basic filesystem layout
|
||||
with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
|
||||
# We use the entire disk instead of setting up partitions on your own
|
||||
if archinstall.arguments['harddrive'].keep_partitions is False:
|
||||
fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
|
||||
|
||||
boot = fs.find_partition('/boot')
|
||||
root = fs.find_partition('/')
|
||||
boot = fs.find_partition('/boot')
|
||||
root = fs.find_partition('/')
|
||||
|
||||
boot.format('vfat')
|
||||
boot.format('vfat')
|
||||
|
||||
# We encrypt the root partition if we got a password to do so with,
|
||||
# Otherwise we just skip straight to formatting and installation
|
||||
if archinstall.arguments.get('!encryption-password', None):
|
||||
root.encrypted = True
|
||||
root.encrypt(password=archinstall.arguments.get('!encryption-password', None))
|
||||
# We encrypt the root partition if we got a password to do so with,
|
||||
# Otherwise we just skip straight to formatting and installation
|
||||
if archinstall.arguments.get('!encryption-password', None):
|
||||
root.encrypted = True
|
||||
root.encrypt(password=archinstall.arguments.get('!encryption-password', None))
|
||||
|
||||
with archinstall.luks2(root, 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_root:
|
||||
unlocked_root.format(root.filesystem)
|
||||
unlocked_root.mount('/mnt')
|
||||
else:
|
||||
root.format(root.filesystem)
|
||||
root.mount('/mnt')
|
||||
with archinstall.luks2(root, 'luksloop', archinstall.arguments.get('!encryption-password', None)) as unlocked_root:
|
||||
unlocked_root.format(root.filesystem)
|
||||
unlocked_root.mount('/mnt')
|
||||
else:
|
||||
root.format(root.filesystem)
|
||||
root.mount('/mnt')
|
||||
|
||||
boot.mount('/mnt/boot')
|
||||
install_on('/mnt')
|
||||
boot.mount('/mnt/boot')
|
||||
|
||||
install_on('/mnt')
|
||||
Loading…
Reference in New Issue