@@ -22,6 +22,9 @@ grub_efi_install()

     if [[ $HDD == *"loop"* ]]

     then

          BOOT_PARTITION=/dev/mapper/`basename ${HDD}`p1

+    elif [[ $HDD == *"nvme"* ]]

+    then

+         BOOT_PARTITION=${HDD}p1

     else

          BOOT_PARTITION=${HDD}1

     fi

@@ -19,7 +19,7 @@ LOG_DEBUG   = 7

 default_partitions = [

                         {"mountpoint": "/", "size": 0, "filesystem": "ext4"},

-                    ]

+                     ]

 def partition_compare(p1, p2):

     if 'mountpoint' in p1 and 'mountpoint' in p2:

@@ -70,6 +70,7 @@ def partition_disk(disk, partitions):

         if 'nvme' in disk:

             prefix = 'p'

         partition['path'] = disk + prefix + `partition_number`

+        partition_number = partition_number + 1

     # Adding the last extendible partition

     if extensible_partition: