add gpt partition types

1 files changed, 30 insertions, 6 deletions

diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh
index a1e849c..725f39a 100755
--- a/scripts/tar-to-image.sh
+++ b/scripts/tar-to-image.sh
@@ -118,6 +118,18 @@ if test ! -f "$tarb"; then
 fi
 
 ######################################################################
+# uuids
+
+uuid_gpt_efi="C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
+uuid_gpi_swap="0657fd6d-a4ab-43c4-84e5-0933c84b4f4f"
+uuid_gpi_root="FIXME"
+
+uuid_gpi_root_ia32="44479540-f297-41b2-9af7-d131d5f0458a"
+uuid_gpi_root_x64="4f68bce3-e8cd-4db1-96e7-fbcaf984b709"
+uuid_gpi_root_arm="69dad710-2ce4-4e3c-b16c-21a1d49abed3"
+uuid_gpi_root_a64="b921b045-1df0-41c3-af44-4c6f280d3fae"
+
+######################################################################
 # guestfish script helpers
 
 function fish() {
@@ -170,13 +182,14 @@ function fish_copy_tar() {
 }
 
 function fish_part_efi_grub2() {
-	local uuid_efi="C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
 	local id_uefi id_boot id_swap id_root
 
 	fish_partition gpt 64 384 512
 
-	fish part-set-gpt-type /dev/sda 1 ${uuid_efi}
+	fish part-set-gpt-type /dev/sda 1 ${uuid_gpt_efi}
 	fish part-set-bootable /dev/sda 1 true
+	fish part-set-gpt-type /dev/sda 3 ${uuid_gpt_swap}
+	fish part-set-gpt-type /dev/sda 4 ${uuid_gpt_root}
 
 	msg "creating filesystems"
 	fish mkfs fat	/dev/sda1	label:UEFI
@@ -230,13 +243,14 @@ EOF
 }
 
 function fish_part_efi_systemd() {
-	local uuid_efi="C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
 	local id_uefi id_swap id_root
 
 	fish_partition gpt 512 0 512
 
-	fish part-set-gpt-type /dev/sda 1 ${uuid_efi}
+	fish part-set-gpt-type /dev/sda 1 ${uuid_gpt_efi}
 	fish part-set-bootable /dev/sda 1 true
+	fish part-set-gpt-type /dev/sda 2 ${uuid_gpt_swap}
+	fish part-set-gpt-type /dev/sda 3 ${uuid_gpt_root}
 
 	msg "creating filesystems"
 	fish mkfs fat	/dev/sda1	label:UEFI
@@ -418,11 +432,21 @@ if test "$GUESTFISH_PID" = ""; then
 fi
 
 case "$(uname -m)" in
-armv7* | aarch64)
+armv7*)
 	console="console=ttyAMA0,115200 console=tty1"
+	uuid_gpi_root="$uuid_gpi_root_arm"
+	;;
+aarch64)
+	console="console=ttyAMA0,115200 console=tty1"
+	uuid_gpi_root="$uuid_gpi_root_a64"
+	;;
+i?86)
+	console="console=ttyS0,115200 console=tty1"
+	uuid_gpi_root="$uuid_gpi_root_ia32"
 	;;
-i?86 | x86_64)
+x86_64)
 	console="console=ttyS0,115200 console=tty1"
+	uuid_gpi_root="$uuid_gpi_root_x64"
 	;;
 esac