From 99d257c9ca814515f3c6ef04937a4bb24d9c9ea7 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 26 Jun 2013 11:36:27 +0300 Subject: [PATCH] Revert "baseimager: add a couple of more installer FW variables" A better solution is invented. This reverts commit be0a53342bec78025413dbbd0bf4de5d9c8b454f. --- mic/imager/baseimager.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py index b8e414c..39bb6dd 100644 --- a/mic/imager/baseimager.py +++ b/mic/imager/baseimager.py @@ -434,8 +434,6 @@ class BaseImageCreator(object): env = {} pnum = 0 - root_pnum = "" - boot_pnum = "" for p in kickstart.get_partitions(self.ks): env.update(self._set_part_env(pnum, "SIZE", p.size)) @@ -446,24 +444,8 @@ class BaseImageCreator(object): env.update(self._set_part_env(pnum, "BOOTFLAG", p.active)) env.update(self._set_part_env(pnum, "ALIGN", p.align)) env.update(self._set_part_env(pnum, "TYPE_ID", p.part_type)) - - if p.mountpoint == "/": - assert root_pnum == "" - root_pnum = pnum - elif p.mountpoint == "/boot": - assert boot_pnum == "" - boot_pnum = pnum - pnum += 1 - # Root and boot parition numbers - assert root_pnum != "" - if boot_pnum == "": - # The boot parition is the root partition - boot_pnum = root_pnum - env[self.installerfw_prefix + "ROOT_PART_NUM"] = str(root_pnum) - env[self.installerfw_prefix + "BOOT_PART_NUM"] = str(boot_pnum) - # Count of paritions env[self.installerfw_prefix + "PART_COUNT"] = str(pnum) -- 2.7.4