Browse code

Installer: Detect for mmcblk devices

Change-Id: Iff7fe1aee2ca56099a5e49c352d6a5896a073ceb
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5614
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Bo Gan authored on 2018/09/08 08:12:06
Showing 3 changed files
... ...
@@ -14,7 +14,7 @@ class Device(object):
14 14
 
15 15
     @staticmethod
16 16
     def refresh_devices():
17
-        devices_list = subprocess.check_output(['lsblk', '-d', '-I', '8,259', '-n',
17
+        devices_list = subprocess.check_output(['lsblk', '-d', '-I', '8,179,259', '-n',
18 18
                                                 '--output', 'NAME,SIZE,MODEL'],
19 19
                                                stderr=open(os.devnull, 'w'))
20 20
         return Device.wrap_devices_from_list(devices_list)
... ...
@@ -22,7 +22,7 @@ class Device(object):
22 22
     @staticmethod
23 23
     def refresh_devices_bytes():
24 24
         devices_list = subprocess.check_output(['lsblk', '-d', '--bytes', '-I',
25
-                                                '8,259', '-n', '--output', 'NAME,SIZE,MODEL'],
25
+                                                '8,179,259', '-n', '--output', 'NAME,SIZE,MODEL'],
26 26
                                                stderr=open(os.devnull, 'w'))
27 27
         return Device.wrap_devices_from_list(devices_list)
28 28
 
... ...
@@ -22,7 +22,7 @@ grub_efi_install()
22 22
     if [[ $HDD == *"loop"* ]]
23 23
     then
24 24
          BOOT_PARTITION=/dev/mapper/`basename ${HDD}`p1
25
-    elif [[ $HDD == *"nvme"* ]]
25
+    elif [[ $HDD == *"nvme"* || $HDD == *"mmcblk"* ]]
26 26
     then
27 27
          BOOT_PARTITION=${HDD}p1
28 28
     else
... ...
@@ -68,7 +68,7 @@ def partition_disk(disk, partitions):
68 68
 
69 69
         partition['partition_number'] = partition_number
70 70
         prefix = ''
71
-        if 'nvme' in disk:
71
+        if 'nvme' in disk or 'mmcblk' in disk:
72 72
             prefix = 'p'
73 73
         partition['path'] = disk + prefix + repr(partition_number)
74 74
         partition_number = partition_number + 1