now it be really ficksed

3 files changed, 11 insertions, 12 deletions

diff --git a/partitions/part2.conf b/partitions/part2.conf
index d4a3419..04b15f4 100644
--- a/partitions/part2.conf
+++ b/partitions/part2.conf
@@ -1,4 +1,4 @@
 name=samizdat-grub
 type=bios-grub
-allocation=64M
+allocation=1M
 rebuild=always
diff --git a/partitions/part8.conf b/partitions/part8.conf
index f0ef2aa..63d44ea 100644
--- a/partitions/part8.conf
+++ b/partitions/part8.conf
@@ -1,4 +1,4 @@
-name=ptable-backup
-type=partition-table
-allocation=1M
+name=samizdat-boot
+type=boot
+allocation=200M
 rebuild=always
diff --git a/src/partvi b/src/partvi
index 654c235..268b2de 100755
--- a/src/partvi
+++ b/src/partvi
@@ -98,8 +98,8 @@ build_partition_image()
 
                 case "$type" in
                         efi-system-partition) mkfs.fat -F 32 -I "$tmp" || die "mkfs.vfat failed" ;;
-                        bios-grub)            mkfs.fat -F 32 -I "$tmp" || die "mkfs.vfat failed" ;;
-                        samizdat-keys)        mkfs.btrfs -q "$tmp" || die "mkfs.btrfs failed" ;;
+                        bios-grub)            ;; # mkfs.fat -F 32 -I "$tmp" || die "mkfs.vfat failed" ;;
+                        boot|samizdat-keys)   mkfs.btrfs -q "$tmp" || die "mkfs.btrfs failed" ;;
                         dm-verity-data)
                                 partuuid=${root_hash:0:32}
                                 cp -f -T --reflink "$data_path" "$builddir"/"$partuuid"
@@ -129,7 +129,7 @@ iterate_partitions()
 
                 require_var type
                 case "$type" in
-                        efi-system-partition|bios-grub|samizdat-*) ;;
+                        efi-system-partition|bios-grub|boot|samizdat-*) ;;
                         dm-verity-hashes|dm-verity-data) require_var data_path ;;
                         partition-table) ;;
                         *) die "invalid type: $type" ;;
@@ -196,7 +196,7 @@ create_ptable_conf()
         case "$type" in
                 partition-table) start=$((start + devsz)); return;;
                 efi-system-partition) typecode=C12A7328-F81F-11D2-BA4B-00A0C93EC93B ;;
-#               bios-grub)            typecode=21686148-6449-6E6F-744E-656564454649 ;;
+                bios-grub)            typecode=21686148-6449-6E6F-744E-656564454649 ;;
                 *)                    typecode=0FC63DAF-8483-4772-8E79-3D69D8477DE4 ;;
         esac
 
@@ -295,14 +295,13 @@ do
         require_var name
         require_var type
         case "$type" in
-                dm-verity-hashes|partition-table) ;;
-                efi-system-partition|bios-grub)
+                dm-verity-hashes|partition-table|bios-grub) ;;
+                efi-system-partition|boot)
                         mkdir -p "$mnt"
                         loudly $sudo mount "$dev" "$mnt"
 
-                        if [ "$type" = 'bios-grub' ]
+                        if [ "$type" = 'boot' ]
                         then
-                                $sudo mkdir "$mnt"/grub
                                 BOOT_DIR=$mnt
                         else
                                 EFI_DIR=$mnt