@@ -1,7 +1,7 @@

 Summary:	Default file system

 Name:		filesystem

 Version:	7.5

-Release:	10%{?dist}

+Release:	11%{?dist}

 License:	GPLv3

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

@@ -294,16 +294,8 @@ EOF

 #

 #	8.2. Creating the /etc/fstab File

 #

-cat > %{buildroot}/etc/fstab <<- "EOF"

-#	Begin /etc/fstab

-#	hdparm -I /dev/sda | grep NCQ --> can use barrier

-#system		mnt-pt		type		options			dump fsck

-/dev/sda1	/		    ext4	    defaults,barrier,noatime,noacl,data=ordered 1 1

-/dev/cdrom      /mnt/cdrom      iso9660     ro,noauto              0   0

-# /dev/sda2	swap		swap		pri=1			0 0

-#	mount points

-#	End /etc/fstab

-EOF

+touch %{buildroot}/etc/fstab

+

 #

 #	8.3.2. Configuring Linux Module Load Order

 #

@@ -469,6 +461,8 @@ ln -sv ../usr/lib/os-release %{buildroot}/etc/os-release

 /usr/local/lib64

 %endif

 %changelog

+*   Mon Nov 16 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 7.5-11

+-   Removing /etc/fstab mount entries.

 *   Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 7.5-10

 -   Removint /opt from filesystem.

 *   Fri Oct 02 2015 Vinay Kulkarni <kulkarniv@vmware.com> 7.5-9

@@ -2,7 +2,7 @@

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.2.0

-Release:       7%{?dist}

+Release:       8%{?dist}

 License:       GPLv2

 URL:           http://www.kernel.org/

 Group:         System Environment/Kernel

@@ -78,7 +78,7 @@ cp -r Documentation/*        %{buildroot}%{_defaultdocdir}/linux-esx-%{version}

 cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"

 # GRUB Environment Block

 photon_cmdline=init=/lib/systemd/systemd rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 quiet nordrand noreplace-smp cpu_init_udelay=0 plymouth.enable=0

-photon_linux=/boot/vmlinuz-esx-%{version}

+photon_linux=vmlinuz-esx-%{version}

 EOF

 # cleanup dangling symlinks

@@ -120,6 +120,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /usr/src/%{name}-headers-%{version}-%{release}

 %changelog

+*   Fri Nov 13 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 4.2.0-8

+-   Change the linux image directory.

 *   Tue Nov 10 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-7

 -   Get LAPIC timer frequency from HV, skip boot time calibration.

 -   .config: + dummy net driver (M).

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:        linux

 Version:    4.2.0

-Release:    3%{?dist}

+Release:    4%{?dist}

 License:    GPLv2

 URL:        http://www.kernel.org/

 Group:        System Environment/Kernel

@@ -82,8 +82,8 @@ cp -r Documentation/*        %{buildroot}%{_defaultdocdir}/%{name}-%{version}

 cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"

 # GRUB Environment Block

 photon_cmdline=init=/lib/systemd/systemd rootfstype=ext4 ro loglevel=3 quiet plymouth.enable=0

-photon_linux=/boot/vmlinuz-%{version}

-photon_initrd=/boot/initrd.img-no-kmods

+photon_linux=vmlinuz-%{version}

+photon_initrd=initrd.img-no-kmods

 EOF

 #    Cleanup dangling symlinks

@@ -139,6 +139,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /lib/modules/%{version}/kernel/sound

 %changelog

+*   Fri Nov 13 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 4.2.0-4

+-   Change the linux image directory.

 *	Wed Nov 11 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-3

 - 	Added the build essential files in the dev sub-package.

 *	Mon Nov 09 2015 Vinay Kulkarni <kulkarniv@vmware.com> 4.2.0-2

@@ -126,16 +126,21 @@ class Installer(object):

             # install grub

             try:

                 if self.install_config['boot'] == 'bios':

-                    process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "bios", self.install_config['disk']['disk'], self.install_config['disk']['root']], stdout=self.output)

+                    process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "bios", self.install_config['disk']['disk'], self.install_config['disk']['root'], self.install_config['disk']['boot'], self.install_config['disk']['bootdirectory']], stdout=self.output)

                 elif self.install_config['boot'] == 'efi':

-                    process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "efi", self.install_config['disk']['disk'], self.install_config['disk']['root']], stdout=self.output)

+                    process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "efi", self.install_config['disk']['disk'], self.install_config['disk']['root'], self.install_config['disk']['boot'], self.install_config['disk']['bootdirectory']], stdout=self.output)

             except:

                 #install bios if variable is not set.

-                process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "bios", self.install_config['disk']['disk'], self.install_config['disk']['root']], stdout=self.output)

+                process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "bios", self.install_config['disk']['disk'], self.install_config['disk']['root'], self.install_config['disk']['boot'], self.install_config['disk']['bootdirectory']], stdout=self.output)

             retval = process.wait()

-        process = subprocess.Popen([self.unmount_disk_command, '-w', self.photon_root], stdout=self.output)

+            self.update_fstab()

+

+        command = [self.unmount_disk_command, '-w', self.photon_root]

+        if not self.install_config['iso_system']:

+            command.extend(self.generate_partitions_param(reverse = True))

+        process = subprocess.Popen(command, stdout=self.output)

         retval = process.wait()

         if self.iso_installer:

@@ -264,10 +269,56 @@ class Installer(object):

         else:

             self.copy_rpms()

+    def update_fstab(self):

+        fstab_file = open(os.path.join(self.photon_root, "etc/fstab"), "w")

+        fstab_file.write("#system\tmnt-pt\ttype\toptions\tdump\tfsck\n")

+

+        for partition in self.install_config['disk']['partitions']:

+            options = 'defaults'

+            dump = 1

+            fsck = 2

+

+            if 'mountpoint' in partition and partition['mountpoint'] == '/':

+                options = options + ',barrier,noatime,noacl,data=ordered'

+                fsck = 1

+            

+            if partition['filesystem'] == 'swap':

+                mountpoint = 'swap'

+                dump = 0

+                fsck = 0

+            else:

+                mountpoint = partition['mountpoint']

+

+            fstab_file.write("{}\t{}\t{}\t{}\t{}\t{}\n".format(

+                partition['path'],

+                mountpoint,

+                partition['filesystem'],

+                options,

+                dump,

+                fsck

+                ))

+

+        fstab_file.close()

+

+    def generate_partitions_param(self, reverse = False):

+        if reverse:

+            step = -1

+        else:

+            step = 1

+        params = []

+        for partition in self.install_config['disk']['partitions'][::step]:

+            if partition["filesystem"] == "swap":

+                continue

+

+            params.extend(['--partitionmountpoint', partition["path"], partition["mountpoint"]])

+        return params

+

     def initialize_system(self):

         #Setup the disk

         if (not self.install_config['iso_system']):

-            process = subprocess.Popen([self.mount_command, '-w', self.photon_root, self.install_config['disk']['root']], stdout=self.output)

+            command = [self.mount_command, '-w', self.photon_root]

+            command.extend(self.generate_partitions_param())

+            process = subprocess.Popen(command, stdout=self.output)

             retval = process.wait()

         self.copy_files()

@@ -21,11 +21,24 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name

 [ ${EUID} -eq 0 ]	|| fail "${PRGNAME}: Need to be root user: FAILURE"

 > ${LOGFILE}		#	clear/initialize logfile

-# Check if passing a partition

-if [ $# -eq 1 ] 

-	then

-		PARTITION=$1

-fi

+while [[ $# > 0 ]]

+do

+    key="$1"

+    shift

+ 

+    case $key in

+        -p|--partitionmountpoint)

+        PARTITION="$1"

+        MOUNTPOINT="$2"

+        shift 2

-run_command "Mounting HD" "mount -v -t ext4 ${PARTITION} ${BUILDROOT}" "${LOGFILE}"

+        # make sure the directory exists

+        run_command "Making Directory" "mkdir -p ${BUILDROOT}${MOUNTPOINT}" "${LOGFILE}"

+        run_command "Mounting Partition" "mount -v ${PARTITION} ${BUILDROOT}${MOUNTPOINT}" "${LOGFILE}"

+    ;;

+    *)

+        # unknown option

+    ;;

+    esac

+done

@@ -6,11 +6,11 @@

 #      Author:  sharathg@vmware.com             #

 #     Options:                                  #

 #################################################

-#	Overview

-#		This is a precursor for the vmware build system.

-#		This assumes that an empty hard disk is attached to the build VM.

-#		The path to this empty disk is specified in the HDD variable in config.inc

-#	End

+#    Overview

+#        This is a precursor for the vmware build system.

+#        This assumes that an empty hard disk is attached to the build VM.

+#        The path to this empty disk is specified in the HDD variable in config.inc

+#    End

 #

 grub_efi_install()

@@ -39,30 +39,32 @@ grub_mbr_install()

     $grubInstallCmd --force --boot-directory=$BUILDROOT/boot "$HDD"

 }

-set -o errexit		# exit if error...insurance ;)

-set -o nounset		# exit if variable not initalized

-set +h			# disable hashall

-PRGNAME=${0##*/}	# script name minus the path

-source config.inc		#	configuration parameters

-source function.inc		#	commonn functions

-LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name

-#LOGFILE=/dev/null		#	uncomment to disable log file

-ARCH=$(uname -m)	# host architecture

-[ ${EUID} -eq 0 ]	|| fail "${PRGNAME}: Need to be root user: FAILURE"

-> ${LOGFILE}		#	clear/initialize logfile

+set -o errexit        # exit if error...insurance ;)

+set -o nounset        # exit if variable not initalized

+set +h            # disable hashall

+PRGNAME=${0##*/}    # script name minus the path

+source config.inc        #    configuration parameters

+source function.inc        #    commonn functions

+LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"    #    set log file name

+ARCH=$(uname -m)    # host architecture

+[ ${EUID} -eq 0 ]    || fail "${PRGNAME}: Need to be root user: FAILURE"

+> ${LOGFILE}        #    clear/initialize logfile

 # Check if passing a HHD and partition

-if [ $# -eq 3 ] 

-	then

+if [ $# -eq 5 ] 

+    then

         BOOTMODE=$1

-	HDD=$2

-	PARTITION=$3

+    HDD=$2

+    ROOT_PARTITION_PATH=$3

+    BOOT_PARTITION_PATH=$4

+    BOOT_DIRECTORY=$5

 fi

 #

-#	Install grub2.

+#    Install grub2.

 #

-UUID=$(blkid -s UUID -o value $PARTITION)

+UUID=$(blkid -s UUID -o value $ROOT_PARTITION_PATH)

+BOOT_UUID=$(blkid -s UUID -o value $BOOT_PARTITION_PATH)

 grubInstallCmd=""

 mkdir -p $BUILDROOT/boot/grub2

@@ -91,10 +93,11 @@ cat > $BUILDROOT/boot/grub2/grub.cfg << EOF

 function set_rootpartition {

     if [ "\$photon_initrd" ]; then

-        set rootpartition=UUID=\$photon_uuid

+        set rootpartition=UUID=$UUID

     else

-        regexp -s dev '.{2}(.)' \$root

-        regexp -s part '.*(.)' \$root

+        search -n -u $UUID -s rootpartition_device

+        regexp -s dev '.{2}(.)' \$rootpartition_device

+        regexp -s part '.*(.)' \$rootpartition_device

         regexp -s char '.{'\$dev'}(.)' abcdefghij

         set rootpartition=/dev/sd\$char\$part

     fi

@@ -102,9 +105,8 @@ function set_rootpartition {

 set default=0

 set timeout=5

-set photon_uuid=$UUID

-search -n -u \$photon_uuid -s

-loadfont /boot/grub2/unifont.pf2

+search -n -u $BOOT_UUID -s

+loadfont "$BOOT_DIRECTORY"grub2/unifont.pf2

 insmod gfxterm

 insmod vbe

@@ -117,14 +119,14 @@ gfxpayload=keep

 terminal_output gfxterm

-set theme=/boot/grub2/themes/photon/theme.txt

-load_env -f /boot/photon.cfg

+set theme="$BOOT_DIRECTORY"grub2/themes/photon/theme.txt

+load_env -f "$BOOT_DIRECTORY"photon.cfg

 set_rootpartition

 menuentry "Photon" {

-    linux \$photon_linux root=\$rootpartition \$photon_cmdline

+    linux "$BOOT_DIRECTORY"\$photon_linux root=\$rootpartition \$photon_cmdline

     if [ "\$photon_initrd" ]; then

-        initrd \$photon_initrd

+        initrd "$BOOT_DIRECTORY"\$photon_initrd

     fi

 }

 # End /boot/grub2/grub.cfg

@@ -134,4 +136,3 @@ EOF

 rm -rf "$BUILDROOT"/tools

 rm -rf "$BUILDROOT"/RPMS

-#umount $BUILDROOT

@@ -20,11 +20,30 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name

 #LOGFILE=/dev/null		#	uncomment to disable log file

 [ ${EUID} -eq 0 ] 	|| fail "${PRGNAME}: Need to be root user: FAILURE"

 [ -z ${BUILDROOT} ]		&& fail "${PRGNAME}: BUILDROOT not set: FAILURE"

-if mountpoint ${BUILDROOT}/run	>/dev/null 2>&1; then umount ${BUILDROOT}/run; fi

-if mountpoint ${BUILDROOT}/sys	>/dev/null 2>&1; then umount ${BUILDROOT}/sys; fi

-if mountpoint ${BUILDROOT}/proc	>/dev/null 2>&1; then umount ${BUILDROOT}/proc; fi

-if mountpoint ${BUILDROOT}/dev/pts	>/dev/null 2>&1; then umount ${BUILDROOT}/dev/pts; fi

-if mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then umount ${BUILDROOT}/dev; fi

-if mountpoint ${BUILDROOT}	>/dev/null 2>&1; then umount ${BUILDROOT}; fi

+if mountpoint ${BUILDROOT}/run >/dev/null 2>&1; then umount ${BUILDROOT}/run; fi

+if mountpoint ${BUILDROOT}/sys >/dev/null 2>&1; then umount ${BUILDROOT}/sys; fi

+if mountpoint ${BUILDROOT}/proc    >/dev/null 2>&1; then umount ${BUILDROOT}/proc; fi

+if mountpoint ${BUILDROOT}/dev/pts >/dev/null 2>&1; then umount ${BUILDROOT}/dev/pts; fi

+if mountpoint ${BUILDROOT}/dev >/dev/null 2>&1; then umount ${BUILDROOT}/dev; fi

+

+while [[ $# > 0 ]]

+do

+    key="$1"

+    shift

+ 

+    case $key in

+        -p|--partitionmountpoint)

+        PARTITION="$1"

+        MOUNTPOINT="$2"

+        shift 2

+

+        # make sure the directory exists

+        if mountpoint ${BUILDROOT}${MOUNTPOINT} >/dev/null 2>&1; then umount ${BUILDROOT}${MOUNTPOINT}; fi

+    ;;

+    *)

+        # unknown option

+    ;;

+    esac

+done

 exit 0

@@ -17,71 +17,103 @@ LOG_NOTICE  = 5

 LOG_INFO    = 6

 LOG_DEBUG   = 7

-def partition_disk(disk, docker_partition_size = None, swap_partition_size = None):

+default_partitions = [

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

+                    ]

+

+def partition_compare(p1, p2):

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

+        if len(p1['mountpoint']) == len(p2['mountpoint']):

+            return cmp(p1['mountpoint'], p2['mountpoint'])

+        return len(p1['mountpoint']) - len(p2['mountpoint'])

+    return 0

+

+def partition_disk(disk, partitions):

     partitions_data = {}

     partitions_data['disk'] = disk

-

-    root_partition_number = 2

-    curr_partition_number = root_partition_number

-    partitions_data['root'] = disk + `root_partition_number`

-

-    if docker_partition_size != None:

-        docker_partition_number = curr_partition_number + 1

-        curr_partition_number = curr_partition_number + 1

-        partitions_data['docker'] = disk + `docker_partition_number`

-

-    if swap_partition_size != None:

-        swap_partition_number = curr_partition_number + 1

-        curr_partition_number = curr_partition_number + 1

-        partitions_data['swap'] = disk + `swap_partition_number`

-

+    partitions_data['partitions'] = partitions

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

     # Clear the disk

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

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

     retval = process.wait()

     if retval != 0:

-    	return None

-

-

-    partition_cmd = ['sgdisk', '-n', '1::+2M']

-    if swap_partition_size != None:

-        partition_cmd.extend(['-n', '{}:-{}M'.format(swap_partition_number, swap_partition_size)])

-    if docker_partition_size != None:

-        partition_cmd.extend(['-n', '{}:-{}M'.format(docker_partition_number, docker_partition_size)])       

-    partition_cmd.extend(['-n', `root_partition_number`, '-p', partitions_data['disk']])

+        log(LOG_ERROR, "Failed clearing disk {0}".format(disk))

+        return None

+    # Partitioning the disk

+    extensible_partition = None

+    partitions_count = len(partitions)

+    partition_number = 1

+    # Adding the bios partition

+    partition_cmd = ['sgdisk', '-n', `partitions_count + 1` + ':-2M:']

+    # Adding the known size partitions

+    for partition in partitions:

+        if partition['size'] == 0:

+            # Can not have more than 1 extensible partition 

+            if extensible_partition != None:

+                log(LOG_ERROR, "Can not have more than 1 extensible partition")

+                return None

+            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

+

+    # Adding the last extendible partition

+    if extensible_partition:

+        partition_cmd.extend(['-n', `extensible_partition['partition_number']`])

+

+    partition_cmd.extend(['-p', disk])

+

+    # Run the partitioning command

     process = subprocess.Popen(partition_cmd, stdout = output)

     retval = process.wait()

     if retval != 0:

+        log(LOG_ERROR, "Faild partition disk, command: {0}". format(partition_cmd))

         return None

     # Add the grub flags

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

+    process = subprocess.Popen(['sgdisk', '-t' + `partitions_count + 1` + ':ef02', disk], stdout = output)

     retval = process.wait()

     if retval != 0:

+        log(LOG_ERROR, "Failed to setup grub partition")

         return None

-    # format the file system

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

-    retval = process.wait()

-    if retval != 0:

+    # Format the filesystem

+    for partition in partitions:

+        if "mountpoint" in partition:

+            if partition['mountpoint'] == '/':

+                partitions_data['root'] = partition['path']

+            elif partition['mountpoint'] == '/boot':

+                partitions_data['boot'] = partition['path']

+                partitions_data['bootdirectory'] = '/'

+        if partition['filesystem'] == "swap":

+            process = subprocess.Popen(['mkswap', partition['path']], stdout = output)

+            retval = process.wait()

+            if retval != 0:

+                log(LOG_ERROR, "Failed to create swap partition @ {}".format(partition['path']))

+                return None

+        else:

+            process = subprocess.Popen(['mkfs', '-t', partition['filesystem'], partition['path']], stdout = output)

+            retval = process.wait()

+            if retval != 0:

+                log(LOG_ERROR, "Failed to format {} partition @ {}".format(partition['filesystem'], partition['path']))

+                return None

+

+    # Check if there is no root partition

+    if not 'root' in partitions_data:

+        log(LOG_ERROR, "There is no partition assigned to root '/'")

         return None

-    # format the docker partition

-    if docker_partition_size != None:

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

-        retval = process.wait()

-        if retval != 0:

-            return None 

-

-    # format the swap partition

-    if swap_partition_size != None:

-        process = subprocess.Popen(['mkswap', partitions_data['swap']], stdout = output)

-        retval = process.wait()

-        if retval != 0:

-            return None

-    	

+    if not 'boot' in partitions_data:

+        partitions_data['boot'] = partitions_data['root']

+        partitions_data['bootdirectory'] = '/boot/'

+

+    partitions.sort(lambda p1,p2: partition_compare(p1, p2))

+	

     return partitions_data

 def replace_string_in_file(filename,  search_string,  replace_string):

@@ -8,10 +8,8 @@ enabled = True

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

 	if ks_config:

-		docker_partition_size = None

-		swap_partition_size = None

-		if 'docker_partition_size' in ks_config:

-			docker_partition_size = ks_config['docker_partition_size']

-		if 'swap_partition_size' in ks_config:

-			swap_partition_size = ks_config['swap_partition_size']

-		config['disk'] = commons.partition_disk(ks_config['disk'], docker_partition_size, swap_partition_size)

+		if 'partitions' in ks_config:

+			partitions = ks_config['partitions']

+		else:

+			partitions = commons.default_partitions

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

@@ -77,8 +77,13 @@ def create_vmdk_and_partition(config, vmdk_path):

             count += 1

         elif line.startswith("ROOT_PARTITION="):

             partitions_data['root'] = line.replace("ROOT_PARTITION=", "").strip()

+            partitions_data['boot'] = partitions_data['root']

+            partitions_data['bootdirectory'] = '/boot/'

             count += 1

+    if count == 2:

+        partitions_data['partitions'] = [{'path': partitions_data['root'], 'mountpoint': '/', 'filesystem': 'ext4'}]

+

     return partitions_data, count == 2

 def create_rpm_list_to_copy_in_iso(build_install_option, output_data_path):

@@ -6,6 +6,12 @@

             "text": "VMware123!"

         },

     "disk": "/dev/sda",

+    "partitions": [

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

+                        {"mountpoint": "/boot", "size": 128, "filesystem": "ext4"},

+                        {"mountpoint": "/root", "size": 128, "filesystem": "ext4"},

+                        {"size": 128, "filesystem": "swap"}

+                    ],

     "type": "minimal",

     "additional_packages": ["vim"],

     "postinstall": [

@@ -50,7 +50,7 @@ class SelectDisk(object):

         # Do the partitioning

         self.window.clearerror()

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

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

         if partitions_data == None:

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

         else: