Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/installer.py
diff options
context:
space:
mode:
Diffstat (limited to 'installer.py')
-rw-r--r--installer.py23
1 files changed, 10 insertions, 13 deletions
diff --git a/installer.py b/installer.py
index 1204ecd2..195ee60c 100644
--- a/installer.py
+++ b/installer.py
@@ -1,25 +1,22 @@
import archinstall, getpass
-## dd if=/dev/zero of=test.img bs=1G count=4
-## losetup -fP test.img
+# Unmount and close previous runs
archinstall.sys_command(f'umount -R /mnt', surpress_errors=True)
archinstall.sys_command(f'cryptsetup close /dev/mapper/luksloop', surpress_errors=True)
-#harddrive = archinstall.select_disk(archinstall.all_disks())
-harddrive = archinstall.all_disks()['/dev/loop0']
-disk_password = '1234' # getpass.getpass(prompt='Disk password (won\'t echo): ')
+# Select a harddrive and a disk password
+harddrive = archinstall.select_disk(archinstall.all_disks())
+disk_password = getpass.getpass(prompt='Disk password (won\'t echo): ')
with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
+ # Use the entire disk instead of setting up partitions on your own
fs.use_entire_disk('luks2')
- with archinstall.luks2(fs) as crypt:
- if harddrive.partition[1].size == '512M':
- raise OSError('Trying to encrypt the boot partition for petes sake..')
- key_file = crypt.encrypt(harddrive.partition[1], password=disk_password, key_size=512, hash_type='sha512', iter_time=10000, key_file='./pwfile')
+ if harddrive.partition[1].size == '512M':
+ raise OSError('Trying to encrypt the boot partition for petes sake..')
+ harddrive.partition[0].format('fat32')
- unlocked_device = crypt.unlock(harddrive.partition[1], 'luksloop', key_file)
-
- harddrive.partition[0].format('fat32')
+ with archinstall.luks2(harddrive.partition[1], 'luksloop', disk_password) as unlocked_device:
unlocked_device.format('btrfs')
with archinstall.Installer(unlocked_device, hostname='testmachine') as installation:
@@ -27,7 +24,7 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
installation.add_bootloader(harddrive.partition[0])
installation.add_additional_packages(['nano', 'wget', 'git'])
- installation.install_profile('desktop')
+ installation.install_profile('workstation')
installation.user_create('anton', 'test')
installation.user_set_pw('root', 'toor')