This hack was important to stop people installing Xen dom0
on a machine where it wouldn't boot.
We don't have dom0 currently and now always makes sense to
allow people to install virt-manager and co. for containers,
qemu etc. etc.
If the hack ever comes back, it should just be to delete
the xen-hypervisor package (not in comps for F10) from the
list of options.
Signed-off-by: Mark McLoughlin <markmc@xxxxxxxxxx>
---
iutil.py | 35 -----------------------------------
yuminstall.py | 9 ---------
2 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/iutil.py b/iutil.py
index 88dc0b1..1982577 100644
--- a/iutil.py
+++ b/iutil.py
@@ -496,26 +496,6 @@ def isEfi():
return efi
-## Extract the CPU feature flags from /proc/cpuinfo
-# @return A list of CPU feature flags, or an empty list on error.
-def cpuFeatureFlags():
- if not isX86():
- return False
- f = open("/proc/cpuinfo", "r")
- lines = f.readlines()
- f.close()
-
- for line in lines:
- if not line.startswith("flags"):
- continue
- # get the actual flags
- flags = line[:-1].split(":", 1)[1]
- # and split them
- flst = flags.split(" ")
- return flst
-
- return []
-
## Generate the /etc/rpm/platform and /etc/rpm/macros files.
# @param root The root of the filesystem to create the files in.
def writeRpmPlatform(root="/"):
@@ -568,21 +548,6 @@ def writeRpmPlatform(root="/"):
f.close()
-## Check to see if we are in a xen environment.
-#
-def inXen():
- if os.path.exists("/proc/xen/capabilities"):
- return True
- return False
-
-## Check to see if we are in a vmware environment.
-#
-def inVmware():
- out = execWithCapture("lspci", ["-vvv"])
- if "VMware" in out:
- return True
- return False
-
# Architecture checking functions
def isX86(bits=None):
diff --git a/yuminstall.py b/yuminstall.py
index 2741b7c..88f8d1e 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1084,15 +1084,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
for txmbr in self.ayum.tsInfo.getMembers():
txmbr.groups = yum.misc.unique(txmbr.groups)
- # FIXME: hack, are we in xen (#179387)
- # FIXME: hack, are we in vmware (#219696)
- # FIXME: and another bad hack since our xen kernel is PAE
- if iutil.inXen() or \
- iutil.inVmware() or \
- rpmUtils.arch.getBaseArch() == "i386" and "pae" not in iutil.cpuFeatureFlags():
- if self.ayum.comps._groups.has_key("virtualization"):
- del self.ayum.comps._groups["virtualization"]
-
def doRepoSetup(self, anaconda, thisrepo = None, fatalerrors = True):
# We want to call ayum.doRepoSetup one repo at a time so we have
# some concept of which repo didn't set up correctly.
--
1.5.4.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
