@@ -12,7 +12,7 @@

                 "Linux-PAM", "attr", "libcap", "systemd", "dbus",

                 "elfutils-libelf", "sqlite-autoconf", "nspr", "nss", "popt", "lua", "rpm",

                 "gptfdisk", "tar", "gzip", "openssl", "python2", "python2-libs", "python-requests",

-                "pcre", "glib", "parted", "libsigc++", "XML-Parser", "glibmm", "dparted",

+                "pcre",

                 "libgsystem", "ostree","device-mapper","device-mapper-libs","libsepol","libselinux", 

                 "db", "libsolv", "hawkey", "python-hawkey"]

 }

@@ -4,33 +4,30 @@

 #

 #    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

-import curses

 import subprocess

 import os

-import json

-from partition import Partition

 class Device(object):

-    def __init__(self, model, path, size, partitions):

+    def __init__(self, model, path, size):

         self.model = model

         self.path = path

         self.size = size

-        self.partitions = partitions

     @staticmethod

     def refresh_devices():

-        devices_json = subprocess.check_output(['gpartedbin', 'getdevices'], stderr=open(os.devnull, 'w'))

-        devices = Device.wrap_devices_from_dict(json.loads(devices_json))

-        return devices

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

+        return Device.wrap_devices_from_list(devices_list)

     @staticmethod

-    def wrap_devices_from_dict(dct):

-        if dct['success'] == False:

-            return [];

-

+    def wrap_devices_from_list(list):

         devices = []

-        for device in dct['devices']:

+        deviceslines = list.splitlines()

+        for deviceline in deviceslines:

+            cols = deviceline.split(None, 2)

             devices.append(

-                    Device(device['model'], device['path'], device['size'], Partition.wrap_partitions_from_dict_arr(device['partitions'])))

+                    Device(cols[2] #Model

+                        , '/dev/' + cols[0] #Path

+                        , cols[1] #size

+                        ))

         return devices

\ No newline at end of file

@@ -1,8 +1,43 @@

+import os

+import subprocess

 import re

 PRE_INSTALL = "pre-install"

 POST_INSTALL = "post-install"

+def partition_disk(disk):

+    partitions_data = {}

+    partitions_data['disk'] = disk

+    partitions_data['root'] = disk + '2'

+

+    output = open(os.devnull, 'w')

+

+    # Clear the disk

+    process = subprocess.Popen(['sgdisk', '-o', '-g', partitions_data['disk']], stdout = output)

+    retval = process.wait()

+    if retval != 0:

+    	return None

+

+    # 1: grub, 2: filesystem

+    process = subprocess.Popen(['sgdisk', '-n', '1::+2M', '-n', '2:', '-p', partitions_data['disk']], stdout = output)

+    retval = process.wait()

+    if retval != 0:

+    	return None

+

+    # Add the grub flags

+    process = subprocess.Popen(['sgdisk', '-t1:ef02', partitions_data['disk']], stdout = output)

+    retval = process.wait()

+    if retval != 0:

+    	return None

+

+    # format the file system

+    process = subprocess.Popen(['mkfs', '-t', 'ext4', partitions_data['root']], stdout = output)

+    retval = process.wait()

+    if retval != 0:

+    	return None

+    	

+    return partitions_data

+

 def replace_string_in_file(filename,  search_string,  replace_string):

     with open(filename, "r") as source:

         lines=source.readlines()

@@ -5,31 +5,7 @@ import commons

 install_phase = commons.PRE_INSTALL

 enabled = True

-def partition_disk(disk):

-    partitions_data = {}

-    partitions_data['disk'] = disk

-    partitions_data['root'] = disk + '2'

-

-    output = open(os.devnull, 'w')

-

-    # Clear the disk

-    process = subprocess.Popen(['sgdisk', '-o', '-g', partitions_data['disk']], stdout = output)

-    retval = process.wait()

-

-    # 1: grub, 2: filesystem

-    process = subprocess.Popen(['sgdisk', '-n', '1::+2M', '-n', '2:', '-p', partitions_data['disk']], stdout = output)

-    retval = process.wait()

-

-    # Add the grub flags

-    process = subprocess.Popen(['sgdisk', '-t1:ef02', partitions_data['disk']], stdout = output)

-    retval = process.wait()

-

-    # format the file system

-    process = subprocess.Popen(['mkfs', '-t', 'ext4', partitions_data['root']], stdout = output)

-    retval = process.wait()

-    return partitions_data

-

 def execute(name, ks_config, config, root):

 	if ks_config:

-		config['disk'] = partition_disk(ks_config['disk'])

+		config['disk'] = commons.partition_disk(ks_config['disk'])

deleted file mode 100644

@@ -1,21 +0,0 @@

-#! /usr/bin/python2

-#

-#    Copyright (C) 2015 vmware inc.

-#

-#    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

-

-class Partition(object):

-    def __init__(self, path, size, filesystem):

-        self.path = path

-        self.size = size

-        self.filesystem = filesystem

-        self.unallocated = (path == 'unallocated')

-

-    @staticmethod

-    def wrap_partitions_from_dict_arr(arr):

-    	partitions = []

-        for partition in arr:

-            partitions.append(Partition(partition['path'], partition['size'], partition['filesystem']))

-

-        return partitions

-

@@ -4,14 +4,12 @@

 #

 #    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

-import subprocess

-import os

-import json

 from device import Device

 from window import Window

 from actionresult import ActionResult

 from menu import Menu

 from confirmwindow import ConfirmWindow

+import modules.commons

 class SelectDisk(object):

     def __init__(self,  maxy, maxx, install_config):

@@ -42,18 +40,15 @@ class SelectDisk(object):

         if not confirmed:

             return ActionResult(confirmed, None)

-        #self.install_config['disk'] = self.devices[device_index].path

-        #return ActionResult(True, None)

-        

         # Do the partitioning

         self.window.clearerror()

-        json_ret = subprocess.check_output(['gpartedbin', 'defaultpartitions', self.devices[device_index].path], stderr=open(os.devnull, 'w'))

-        json_dct = json.loads(json_ret)

-        if json_dct['success']:

-            self.install_config['disk'] = json_dct['data']

-        else:

+        partitions_data = modules.commons.partition_disk(self.devices[device_index].path)

+        if partitions_data == None:

             self.window.adderror('Partitioning failed, you may try again')

-        return ActionResult(json_dct['success'], None)

+        else:

+            self.install_config['disk'] = partitions_data

+

+        return ActionResult(partitions_data != None, None)

     def display(self, params):

         self.window.addstr(0, 0, 'First, we will setup your disks.\n\nWe have detected {0} disks, choose disk to be auto-partitioned:'.format(len(self.devices)))

@@ -65,7 +60,7 @@ class SelectDisk(object):

             #if index > 0:

                 self.disk_menu_items.append(

                         (

-                            '{2} - {1} MB @ {0}'.format(device.path, device.size, device.model), 

+                            '{2} - {1} @ {0}'.format(device.path, device.size, device.model), 

                             self.guided_partitions, 

                             index

                         )