From cdeb8c314ca6a5b5228561a0b9cfac9bf75b617c Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Thu, 15 Sep 2022 16:44:42 -0500
Subject: [PATCH] Debian: Handle NVMe disk formatting in %mkfs hook

Update the %mkfs kickstart hook to look for NVMe devices and adjust the
device name when formatting partitions and creating the volume group.

Test Plan:
PASS - VBox AIO-SX UEFI/NVMe ISO install
PASS - VBox AIO-SX BIOS/SATA ISO install
PASS - VBox AIO-SX UEFI/SATA ISO install

NOTE: VBox BIOS/NVMe combo not supported

Change-Id: I990f4d0f2a19e56b797acddab3a4e359f79c247b
Closes-Bug: #1989814
Signed-off-by: Robert Church <robert.church@windriver.com>
---
 kickstart/files/kickstart.cfg | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index 273992bf..443cf694 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -1547,6 +1547,13 @@ elif [ "${storage}" = true ] ; then
     get_storage_provisioning_sizes
 fi
 
+fs_dev=$dev
+case ${fs_dev} in
+    *"nvme"*)
+        fs_dev=${fs_dev}p
+        ;;
+esac
+
 # Maintain BIOS partition mappings from previous releases
 part_no=1
 if [ "$USE_UEFI_PARTITIONS" = 0 -o "${controller}" = false ] ; then
@@ -1564,7 +1571,7 @@ if [ "${controller}" = true ] ; then
     # Only init Platform Backup partition filesystem if the partition was just created
     if [ ${BACKUP_PART_FOUND} -eq 0 ] ; then
         # Sanity check
-        [ "${dev}${part_no}" != "${BACKUP_PART}" ] && "Abort creating platform backup filesystem, unexpected location: ${dev}${part_no}"
+        [ "${fs_dev}${part_no}" != "${BACKUP_PART}" ] && "Abort creating platform backup filesystem, unexpected location: ${fs_dev}${part_no}"
 
         ilog "Platform Backup Partition was CREATED. Initialize filesystem on ${BACKUP_PART}"
         mkfs.ext4 -F -L ${BACKUP_PART_LABEL} ${BACKUP_PART}
@@ -1577,23 +1584,23 @@ if [ "${controller}" = true ] ; then
 fi
 
 # Maintain UEFI partition mappings from previous releases
-mkfs.vfat -n otaefi ${dev}${part_no}
-[ ${?} -ne 0 ] && report_failure_with_msg "Failed UEFI filesystem init: ${dev}${part_no}, rc=${?}"
+mkfs.vfat -n otaefi ${fs_dev}${part_no}
+[ ${?} -ne 0 ] && report_failure_with_msg "Failed UEFI filesystem init: ${fs_dev}${part_no}, rc=${?}"
 part_no=$((part_no+1))
 
 # Boot/Root OSTree Partition A (Note: OSTree Partition B not used)
-mkfs.ext4 -F -L otaboot ${dev}${part_no}
-[ ${?} -ne 0 ] && report_failure_with_msg "Failed Boot filesystem init: ${dev}${part_no}, rc=${?}"
+mkfs.ext4 -F -L otaboot ${fs_dev}${part_no}
+[ ${?} -ne 0 ] && report_failure_with_msg "Failed Boot filesystem init: ${fs_dev}${part_no}, rc=${?}"
 part_no=$((part_no+1))
 
-mkfs.ext4 -F -L otaroot ${dev}${part_no}
-[ ${?} -ne 0 ] && report_failure_with_msg "Failed Root filesystem init: ${dev}${part_no}, rc=${?}"
+mkfs.ext4 -F -L otaroot ${fs_dev}${part_no}
+[ ${?} -ne 0 ] && report_failure_with_msg "Failed Root filesystem init: ${fs_dev}${part_no}, rc=${?}"
 part_no=$((part_no+1))
 
 # Flux Partition
 if [ "${INSTFLUX}" = 1 ] ; then
-    mkfs.ext4 -F -L fluxdata ${dev}${part_no}
-    [ ${?} -ne 0 ] && report_failure_with_msg "Failed Fluxdata (/var) filesystem init: ${dev}${part_no}, rc=${?}"
+    mkfs.ext4 -F -L fluxdata ${fs_dev}${part_no}
+    [ ${?} -ne 0 ] && report_failure_with_msg "Failed Fluxdata (/var) filesystem init: ${fs_dev}${part_no}, rc=${?}"
     part_no=$((part_no+1))
 fi
 
@@ -1601,14 +1608,7 @@ fi
 log_lvm_conf "Installer Initial" /etc/lvm/lvm.conf
 
 # Create Volume Group
-case ${dev} in
-    *"nvme"*)
-        pv_part=${dev}p${part_no}
-        ;;
-    *)
-        pv_part=${dev}${part_no}
-        ;;
-esac
+pv_part=${fs_dev}${part_no}
 
 ilog "MINIMUM_PLATFORM_PV_SIZE : ${MINIMUM_PLATFORM_PV_SIZE}"
 ilog "SCRATCH_VOL_SIZE         : ${SCRATCH_VOL_SIZE}"