Compare commits

...

4 commits

Author SHA1 Message Date
askiiart
39616337c3
Add arch-repo so it works with askiiart-blendos/akshara
for details, see line 146 at commit ed115df979
2024-11-07 23:37:38 -06:00
askiiart
e9ddac26dd
fix -F -> -f for mkfs.btrfs 2024-10-07 19:04:20 -05:00
askiiart
85dbad5f85
switch to my version 2024-10-01 22:40:25 -05:00
askiiart
a030f9147a
switch default to btrfs, switch to consistent units, fix wasted space on EFI systems 2024-10-01 11:54:01 -05:00
3 changed files with 8 additions and 6 deletions

View file

@ -6,7 +6,7 @@ arch=(any)
depends=('squashfs-tools' 'arch-install-scripts' 'util-linux' 'parted') depends=('squashfs-tools' 'arch-install-scripts' 'util-linux' 'parted')
provides=('blend-inst') provides=('blend-inst')
conflicts=('blend-inst') conflicts=('blend-inst')
source=('git-inst::git+https://github.com/blend-os/blend-inst.git') source=('git-inst::git+https://git.askiiart.net/askiiart-blendos/blend-inst.git')
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {

11
blend-inst Executable file → Normal file
View file

@ -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')
@ -351,6 +351,7 @@ def inst_akshara(config):
['locale-gen']) ['locale-gen'])
system_config = { system_config = {
'arch-repo': 'https://geo.mirror.pkgbuild.com',
'repo': 'https://pkg-repo.blendos.co', 'repo': 'https://pkg-repo.blendos.co',
'impl': 'http://github.com/blend-os/tracks/raw/main', 'impl': 'http://github.com/blend-os/tracks/raw/main',
'track': 'default-gnome' 'track': 'default-gnome'

1
blend-postinst Executable file → Normal file
View file

@ -61,6 +61,7 @@ def mkdir(path):
def inst_system_config(config): def inst_system_config(config):
system_config = { system_config = {
'arch-repo': 'https://geo.mirror.pkgbuild.com',
'repo': 'https://pkg-repo.blendos.co', 'repo': 'https://pkg-repo.blendos.co',
'impl': 'http://github.com/blend-os/tracks/raw/main', 'impl': 'http://github.com/blend-os/tracks/raw/main',
'track': 'default-gnome' 'track': 'default-gnome'