From a030f9147a6510b3a58879b3fc41b4e69a078f03 Mon Sep 17 00:00:00 2001 From: askiiart Date: Tue, 1 Oct 2024 11:54:01 -0500 Subject: [PATCH 1/6] switch default to btrfs, switch to consistent units, fix wasted space on EFI systems --- blend-inst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blend-inst b/blend-inst index 514de7a..f054018 100755 --- a/blend-inst +++ b/blend-inst @@ -149,17 +149,17 @@ def inst_partition(config): # Create GPT label exec(['parted', '-s', device, 'mklabel', 'gpt']) # Create EFI partition - exec(['parted', '-s', device, 'mkpart', 'fat32', '0', '500']) + exec(['parted', '-s', device, 'mkpart', 'fat32', '0%', '512MiB']) else: # Create msdos label exec(['parted', '-s', device, 'mklabel', 'msdos']) # Create boot partition exec(['parted', '-s', device, 'mkpart', - 'primary', 'ext4', '1MIB', '1400MIB']) + 'primary', 'ext4', '0%', '512MiB']) # Create root partition exec(['parted', '-s', device, 'mkpart', - 'primary', 'ext4', '1500MB', '100%']) + 'primary', 'btrfs', '513MiB', '100%']) global orig_main_partition @@ -176,7 +176,7 @@ def inst_partition(config): exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n') root_partition = '/dev/mapper/new_root' # Format root partition - exec(['mkfs.ext4', '-F', root_partition]) + exec(['mkfs.btrfs', '-F', root_partition]) # Mount partitions mount(root_partition, '/mnt') mkdir('/mnt/boot') @@ -194,7 +194,7 @@ def inst_partition(config): exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n') root_partition = '/dev/mapper/new_root' # Format root partition - exec(['mkfs.ext4', '-F', root_partition]) + exec(['mkfs.btrfs', '-F', root_partition]) # Mount partitions mount(root_partition, '/mnt') mkdir('/mnt/boot') From 85dbad5f85d8473f4082ad6f703c0778949deefd Mon Sep 17 00:00:00 2001 From: askiiart Date: Tue, 1 Oct 2024 22:40:25 -0500 Subject: [PATCH 2/6] switch to my version --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 1d4cdc2..bf9c553 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ arch=(any) depends=('squashfs-tools' 'arch-install-scripts' 'util-linux' 'parted') provides=('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') pkgver() { From e9ddac26dd779e46b4153b62b2fdfc75e285a521 Mon Sep 17 00:00:00 2001 From: askiiart Date: Mon, 7 Oct 2024 19:04:20 -0500 Subject: [PATCH 3/6] fix -F -> -f for mkfs.btrfs --- blend-inst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blend-inst b/blend-inst index f054018..cd0177e 100755 --- a/blend-inst +++ b/blend-inst @@ -176,7 +176,7 @@ def inst_partition(config): exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n') root_partition = '/dev/mapper/new_root' # Format root partition - exec(['mkfs.btrfs', '-F', root_partition]) + exec(['mkfs.btrfs', '-f', root_partition]) # Mount partitions mount(root_partition, '/mnt') mkdir('/mnt/boot') @@ -194,7 +194,7 @@ def inst_partition(config): exec(['cryptsetup', 'open', root_partition, 'new_root', '-'], input=f'{password}\n') root_partition = '/dev/mapper/new_root' # Format root partition - exec(['mkfs.btrfs', '-F', root_partition]) + exec(['mkfs.btrfs', '-f', root_partition]) # Mount partitions mount(root_partition, '/mnt') mkdir('/mnt/boot') From 39616337c358d33fee20d122bf6c931d062ded3c Mon Sep 17 00:00:00 2001 From: askiiart Date: Thu, 7 Nov 2024 23:37:38 -0600 Subject: [PATCH 4/6] Add arch-repo so it works with askiiart-blendos/akshara for details, see line 146 at commit ed115df979 --- blend-inst | 1 + blend-postinst | 1 + 2 files changed, 2 insertions(+) mode change 100755 => 100644 blend-inst mode change 100755 => 100644 blend-postinst diff --git a/blend-inst b/blend-inst old mode 100755 new mode 100644 index cd0177e..427d7c7 --- a/blend-inst +++ b/blend-inst @@ -351,6 +351,7 @@ def inst_akshara(config): ['locale-gen']) system_config = { + 'arch-repo': 'https://geo.mirror.pkgbuild.com', 'repo': 'https://pkg-repo.blendos.co', 'impl': 'http://github.com/blend-os/tracks/raw/main', 'track': 'default-gnome' diff --git a/blend-postinst b/blend-postinst old mode 100755 new mode 100644 index fd09921..c7538c0 --- a/blend-postinst +++ b/blend-postinst @@ -61,6 +61,7 @@ def mkdir(path): def inst_system_config(config): system_config = { + 'arch-repo': 'https://geo.mirror.pkgbuild.com', 'repo': 'https://pkg-repo.blendos.co', 'impl': 'http://github.com/blend-os/tracks/raw/main', 'track': 'default-gnome' From cf1b6b54436549d2fe1ef3ef8dfd082429398b00 Mon Sep 17 00:00:00 2001 From: askiiart Date: Tue, 8 Apr 2025 15:01:23 -0500 Subject: [PATCH 5/6] fix ~1 GiB of wasted space partitioning --- blend-inst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blend-inst b/blend-inst index 514de7a..d95cd10 100755 --- a/blend-inst +++ b/blend-inst @@ -149,17 +149,17 @@ def inst_partition(config): # Create GPT label exec(['parted', '-s', device, 'mklabel', 'gpt']) # Create EFI partition - exec(['parted', '-s', device, 'mkpart', 'fat32', '0', '500']) + exec(['parted', '-s', device, 'mkpart', 'fat32', '0%', '512MiB']) else: # Create msdos label exec(['parted', '-s', device, 'mklabel', 'msdos']) # Create boot partition exec(['parted', '-s', device, 'mkpart', - 'primary', 'ext4', '1MIB', '1400MIB']) + 'primary', 'ext4', '0%', '512MiB']) # Create root partition exec(['parted', '-s', device, 'mkpart', - 'primary', 'ext4', '1500MB', '100%']) + 'primary', 'ext4', '513MiB', '100%']) global orig_main_partition From 703dc2827410be97d3036d29b56cf796f62fce71 Mon Sep 17 00:00:00 2001 From: askiiart Date: Tue, 8 Apr 2025 21:20:37 -0500 Subject: [PATCH 6/6] add arch-repo to system_config this makes it work for blend-inst pull #6 and akshara pull #7 --- blend-inst | 1 + blend-postinst | 1 + 2 files changed, 2 insertions(+) mode change 100755 => 100644 blend-inst mode change 100755 => 100644 blend-postinst diff --git a/blend-inst b/blend-inst old mode 100755 new mode 100644 index d95cd10..90dcbac --- a/blend-inst +++ b/blend-inst @@ -351,6 +351,7 @@ def inst_akshara(config): ['locale-gen']) system_config = { + 'arch-repo': 'https://geo.mirror.pkgbuild.com', 'repo': 'https://pkg-repo.blendos.co', 'impl': 'http://github.com/blend-os/tracks/raw/main', 'track': 'default-gnome' diff --git a/blend-postinst b/blend-postinst old mode 100755 new mode 100644 index fd09921..c7538c0 --- a/blend-postinst +++ b/blend-postinst @@ -61,6 +61,7 @@ def mkdir(path): def inst_system_config(config): system_config = { + 'arch-repo': 'https://geo.mirror.pkgbuild.com', 'repo': 'https://pkg-repo.blendos.co', 'impl': 'http://github.com/blend-os/tracks/raw/main', 'track': 'default-gnome'