Merge branch 'main' into develop

Merget the Issue #43 pull request.

CHANGELOG.md

@@ -9,6 +9,15 @@ Record of the modification in project development.
 ### Fixed
 ### Known Issue
 
+## [1.3.1] - 2023-04-15
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- [Issue 43 : Partition names should be prefixed by "p" for NVMe](https://github.com/suikan4github/kaiten-yaki/pull/43). Thank you Uraza for your contribution. 
+### Known Issue
+
 ## [1.3.0] - 2022-05-15
 ### Added
 - [Issue 31 : Add extra partition functionality.](https://github.com/suikan4github/kaiten-yaki/issues/31)
@@ -96,6 +105,7 @@ See [Testing before release v1.1.0](https://github.com/suikan4github/kaiten-yaki
 
 
 [Unreleased]: https://github.com/suikan4github/kaiten-yaki/compare/v1.3.0...develop
+[1.3.1]: https://github.com/suikan4github/kaiten-yaki/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/suikan4github/kaiten-yaki/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/suikan4github/kaiten-yaki/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/suikan4github/kaiten-yaki/compare/v1.0.0...v1.1.0

script/config.sh

@@ -87,12 +87,20 @@ else
 export ISEFI=0  # No, BIOS
 fi # is it EFI firmware? 
 
+# Detect drive type.
+# For NVME drives, partition names should be prefixed by p.
+if [[ ${DEV} == *"nvme"* ]] ; then
+export PARTPREFIX="p"  # Yes, NVME
+else
+export PARTPREFIX=""   # No, regular
+fi
+
 # Set partition number based on the firmware type
 if [  ${ISEFI} -ne 0  ] ; then 
 # EFI firmware
-export EFIPARTITION=1
-export CRYPTPARTITION=2
+export EFIPARTITION=${PARTPREFIX}1
+export CRYPTPARTITION=${PARTPREFIX}2
 else
 # BIOS firmware
-export CRYPTPARTITION=1
+export CRYPTPARTITION=${PARTPREFIX}1
 fi  # EFI firmware