@@ -15,12 +15,12 @@ class Device(object):

     @staticmethod

     def refresh_devices():

-        devices_list = subprocess.check_output(['lsblk', '-S', '-I', '8', '-n', '--output', 'NAME,SIZE,MODEL'], stderr=open(os.devnull, 'w'))

+        devices_list = subprocess.check_output(['lsblk', '-d', '-I', '8,259', '-n', '--output', 'NAME,SIZE,MODEL'], stderr=open(os.devnull, 'w'))

         return Device.wrap_devices_from_list(devices_list)

     @staticmethod

     def refresh_devices_bytes():

-        devices_list = subprocess.check_output(['lsblk', '-S', '--bytes', '-I', '8', '-n', '--output', 'NAME,SIZE,MODEL'], stderr=open(os.devnull, 'w'))

+        devices_list = subprocess.check_output(['lsblk', '-d', '--bytes', '-I', '8,259', '-n', '--output', 'NAME,SIZE,MODEL'], stderr=open(os.devnull, 'w'))

         return Device.wrap_devices_from_list(devices_list)

     @staticmethod

@@ -57,10 +57,12 @@ def partition_disk(disk, partitions):

             extensible_partition = partition

         else:

             partition_cmd.extend(['-n', '{}::+{}M'.format(partition_number, partition['size'])])

-        

-        partition['partition_number'] = partition_number 

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

-        partition_number = partition_number + 1

+

+        partition['partition_number'] = partition_number

+        prefix = ''

+        if 'nvme' in disk:

+            prefix = 'p'

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

     # Adding the last extendible partition

     if extensible_partition: