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() { diff --git a/blend-inst b/blend-inst old mode 100755 new mode 100644 index 514de7a..427d7c7 --- 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') @@ -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'