switch default to btrfs, switch to consistent units, fix wasted space on EFI systems
This commit is contained in:
parent
29cfb63d20
commit
a030f9147a
1 changed files with 5 additions and 5 deletions
10
blend-inst
10
blend-inst
|
@ -149,17 +149,17 @@ def inst_partition(config):
|
||||||
# Create GPT label
|
# Create GPT label
|
||||||
exec(['parted', '-s', device, 'mklabel', 'gpt'])
|
exec(['parted', '-s', device, 'mklabel', 'gpt'])
|
||||||
# Create EFI partition
|
# Create EFI partition
|
||||||
exec(['parted', '-s', device, 'mkpart', 'fat32', '0', '500'])
|
exec(['parted', '-s', device, 'mkpart', 'fat32', '0%', '512MiB'])
|
||||||
else:
|
else:
|
||||||
# Create msdos label
|
# Create msdos label
|
||||||
exec(['parted', '-s', device, 'mklabel', 'msdos'])
|
exec(['parted', '-s', device, 'mklabel', 'msdos'])
|
||||||
# Create boot partition
|
# Create boot partition
|
||||||
exec(['parted', '-s', device, 'mkpart',
|
exec(['parted', '-s', device, 'mkpart',
|
||||||
'primary', 'ext4', '1MIB', '1400MIB'])
|
'primary', 'ext4', '0%', '512MiB'])
|
||||||
|
|
||||||
# Create root partition
|
# Create root partition
|
||||||
exec(['parted', '-s', device, 'mkpart',
|
exec(['parted', '-s', device, 'mkpart',
|
||||||
'primary', 'ext4', '1500MB', '100%'])
|
'primary', 'btrfs', '513MiB', '100%'])
|
||||||
|
|
||||||
global orig_main_partition
|
global orig_main_partition
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@ def inst_partition(config):
|
||||||
exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n')
|
exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n')
|
||||||
root_partition = '/dev/mapper/new_root'
|
root_partition = '/dev/mapper/new_root'
|
||||||
# Format root partition
|
# Format root partition
|
||||||
exec(['mkfs.ext4', '-F', root_partition])
|
exec(['mkfs.btrfs', '-F', root_partition])
|
||||||
# Mount partitions
|
# Mount partitions
|
||||||
mount(root_partition, '/mnt')
|
mount(root_partition, '/mnt')
|
||||||
mkdir('/mnt/boot')
|
mkdir('/mnt/boot')
|
||||||
|
@ -194,7 +194,7 @@ def inst_partition(config):
|
||||||
exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n')
|
exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n')
|
||||||
root_partition = '/dev/mapper/new_root'
|
root_partition = '/dev/mapper/new_root'
|
||||||
# Format root partition
|
# Format root partition
|
||||||
exec(['mkfs.ext4', '-F', root_partition])
|
exec(['mkfs.btrfs', '-F', root_partition])
|
||||||
# Mount partitions
|
# Mount partitions
|
||||||
mount(root_partition, '/mnt')
|
mount(root_partition, '/mnt')
|
||||||
mkdir('/mnt/boot')
|
mkdir('/mnt/boot')
|
||||||
|
|
Loading…
Reference in a new issue