1 files changed, 24 insertions, 11 deletions

diff --git a/src/parted-usb.sh b/src/parted-usb.sh
index bb63070..e688473 100755
--- a/src/parted-usb.sh
+++ b/src/parted-usb.sh
@@ -16,17 +16,29 @@ MiB()
 initialize_target()
 {
     rm -f "$target"
-    fallocate -l $(($(KiB 17) + $(MiB $end_keys))) "$target"
+    if [ "$ROOTFS" ]
+    then
+        fallocate -l $(($(KiB 17) + $(MiB $end_keys) + $(MiB $rootfs_size))) "$target"
+    else
+        fallocate -l $(($(KiB 17) + $(MiB $end_keys))) "$target"
+    fi
 }
 
+# TODO: Use GUID type tags for each Samizdat partition type.
 partition_target()
 {
-    parted "$target" -sm -a optimal                                          \
-           unit B                                                            \
-           mklabel gpt                                                       \
-           mkpart samizdat-grub 1MiB 8MiB                                    \
-           set 1 bios_grub on                                                \
-           mkpart samizdat-plaintext btrfs ${start_keys}MiB ${end_keys}MiB
+    parted "$target" -sm -a optimal                             \
+           unit MiB                                             \
+           mklabel gpt                                          \
+           mkpart samizdat-grub 1 8                             \
+           set 1 bios_grub on                                   \
+           mkpart samizdat-keys btrfs ${start_keys} ${end_keys}
+
+    if [ "$ROOTFS" ]
+    then
+        parted "$target" -sm -a optimal                         \
+               mkpart samizdat-rootfs btrfs ${end_keys}MiB 100%
+    fi
 }
 
 make_target_bootable()
@@ -74,12 +86,13 @@ with_target()
 
 add_keys()
 {
-    rsync  -a  --info=STATS  "$GPG_INPUT_DIR"/          "$mnt"/gnupghome/
+    rsync  -a  --info=STATS  "$GPG_INPUT_DIR"/ "$mnt"/gnupghome/
 }
 
+initrd_suffix=.samizdat
 add_initrd()
 {
-    rsync  -aL --info=STATS  "$samizdat_linux_dir"/vmlinuz${version} "$samizdat_linux_dir"/initrd.img${version} "$mnt"/linux/
+    rsync  -aL --info=STATS "${1}vmlinuz${2}" "${1}initrd.img${2}${initrd_suffix}" "$mnt"/linux/
 }
 
 add_grub_cfg()
@@ -91,7 +104,7 @@ add_grub_cfg()
 add_all()
 {
     add_keys
-    add_initrd
+    add_initrd "$samizdat_linux_dir"/ "${version_suffix}"
     add_grub_cfg
 }
 
@@ -128,7 +141,7 @@ fi
 
 if [ "$1" ]
 then
-    version=-$1
+    version_suffix=-$1
 fi
 cp --reflink=always "$target" "$target".keyed
 with_target "$target".keyed add_all