[PATCH] Move the knowledge about network packages into ksdata.network.

[Chris Lumens]

This is similar to what we're doing for authconfig and firewall.
---
 pyanaconda/install.py   | 6 ++----
 pyanaconda/kickstart.py | 8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index 087bfa8..b5b8b7a 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -213,6 +213,7 @@ def doInstall(storage, payload, ksdata, instClass):
     # Check for additional packages
     ksdata.authconfig.setup()
     ksdata.firewall.setup()
+    ksdata.network.setup()

# make name resolution work for rpm scripts in chroot
     if flags.can_touch_runtime_system("copy /etc/resolv.conf to sysroot"):
@@ -222,14 +223,11 @@ 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 + ksdata.realm.packages
-    packages += ksdata.authconfig.packages + ksdata.firewall.packages
+    packages += ksdata.authconfig.packages + ksdata.firewall.packages + ksdata.network.packages

if willInstallBootloader:
         packages += storage.bootloader.packages

-    if network.is_using_team_device():
-        packages.append("teamd")
-
     # don't try to install packages from the install class' ignored list and the
     # explicitly excluded ones (user takes the responsibility)
     packages = [p for p in packages
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 804f729..e92aa48 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1079,6 +1079,14 @@ class Logging(commands.logging.FC6_Logging):
             logger.updateRemote(remote_server)

class Network(commands.network.F22_Network):
+    def __init__(self, *args, **kwargs):
+        commands.network.F22_Network.__init__(self, *args, **kwargs)
+        self.packages = []
+
+    def setup(self):
+        if network.is_using_team_device():
+            self.packages = ["teamd"]
+
     def execute(self, storage, ksdata, instClass):
         network.write_network_config(storage, ksdata, instClass, iutil.getSysroot())

[Brian C. Lane]

On Thu, Jun 25, 2015 at 01:15:09PM -0400, Chris Lumens wrote:
> This is similar to what we're doing for authconfig and firewall.
>
> pyanaconda/install.py   | 6 ++----
>  pyanaconda/kickstart.py | 8 ++++++++
>  2 files changed, 10 insertions(+), 4 deletions(-)

Ack!