[PATCH 2/2][anaconda] Don't try to install ntfsprogs in rhel since it isn't included. (#964586)

David Lehman dlehman at redhat.com
Wed Jun 12 17:32:23 UTC 2013


Packages flagged as needed by the installer must be available to install.
This provides a mechanism for this one case where ntfsprogs is not in
rhel's package set.
---
 pyanaconda/install.py             | 3 +++
 pyanaconda/installclass.py        | 7 +++++++
 pyanaconda/installclasses/rhel.py | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index dd39442..7edc63d 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -151,6 +151,9 @@ def doInstall(storage, payload, ksdata, instClass):
     # system is bootable and configurable, and some other packages in order
     # to finish setting up the system.
     packages = storage.packages + ["authconfig", "firewalld"] + ksdata.realm.packages
+
+    # don't try to install packages from the install class' ignored list
+    packages = [p for p in packages if p not in instClass.ignoredPackages]
     payload.preInstall(packages=packages, groups=payload.languageGroups())
     payload.install()
 
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 6d0b1e8..7e04cc4 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -46,6 +46,13 @@ class BaseInstallClass(object):
     name = "base"
     bootloaderTimeoutDefault = None
     bootloaderExtraArgs = []
+
+    # Anaconda flags several packages to be installed based on the configuration
+    # of the system -- things like fs utilities, bootloader, &c. This is a list
+    # of packages that we should not try to install using the aforementioned
+    # mechanism.
+    ignoredPackages = []
+
     _l10n_domain = None
 
     # The default filesystem type to use.  If None, we will use whatever
diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py
index 6f63d31..370b7e1 100644
--- a/pyanaconda/installclasses/rhel.py
+++ b/pyanaconda/installclasses/rhel.py
@@ -33,6 +33,8 @@ class InstallClass(BaseInstallClass):
     bootloaderTimeoutDefault = 5
     bootloaderExtraArgs = []
 
+    ignoredPackages = ["ntfsprogs"]
+
     _l10n_domain = "comps"
 
     efi_dir = "redhat"
-- 
1.8.1.4



More information about the anaconda-patches mailing list