From 2178cc8c939cbd74b3c18b1a52b411a4d4f304d6 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 21 Nov 2015 20:21:09 -0500
Subject: [PATCH] create: Drop explicit kickstart UI

Few users actually use this, and they can easily do it with the kernel
options field.
---
 ui/create.ui          | 36 ------------------------------------
 virtManager/config.py |  4 ----
 virtManager/create.py | 18 ++----------------
 3 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/ui/create.ui b/ui/create.ui
index 682a44024..4185cd103 100644
--- a/ui/create.ui
+++ b/ui/create.ui
@@ -927,24 +927,9 @@ bar</property>
                                                       <object class="GtkTable" id="table7">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="n_rows">2</property>
                                                         <property name="n_columns">2</property>
                                                         <property name="column_spacing">6</property>
                                                         <property name="row_spacing">4</property>
-                                                        <child>
-                                                          <object class="GtkLabel" id="label25">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">_Kickstart URL:</property>
-                                                            <property name="use_underline">True</property>
-                                                            <property name="mnemonic_widget">install-ks-entry</property>
-                                                            <property name="xalign">0</property>
-                                                          </object>
-                                                          <packing>
-                                                            <property name="x_options">GTK_FILL</property>
-                                                            <property name="y_options"/>
-                                                          </packing>
-                                                        </child>
                                                         <child>
                                                           <object class="GtkLabel" id="label26">
                                                             <property name="visible">True</property>
@@ -955,8 +940,6 @@ bar</property>
                                                             <property name="xalign">1</property>
                                                           </object>
                                                           <packing>
-                                                            <property name="top_attach">1</property>
-                                                            <property name="bottom_attach">2</property>
                                                             <property name="x_options">GTK_FILL</property>
                                                             <property name="y_options"/>
                                                           </packing>
@@ -967,25 +950,6 @@ bar</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="invisible_char">•</property>
                                                           </object>
-                                                          <packing>
-                                                            <property name="left_attach">1</property>
-                                                            <property name="right_attach">2</property>
-                                                            <property name="top_attach">1</property>
-                                                            <property name="bottom_attach">2</property>
-                                                            <property name="y_options"/>
-                                                          </packing>
-                                                        </child>
-                                                        <child>
-                                                          <object class="GtkComboBox" id="install-ks-combo">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="has_entry">True</property>
-                                                            <child internal-child="entry">
-                                                            <object class="GtkEntry" id="install-ks-entry">
-                                                            <property name="can_focus">True</property>
-                                                            </object>
-                                                            </child>
-                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
diff --git a/virtManager/config.py b/virtManager/config.py
index 59fe6e4e9..3ab9b0904 100644
--- a/virtManager/config.py
+++ b/virtManager/config.py
@@ -551,15 +551,11 @@ class vmmConfig(object):
 
     def add_media_url(self, url):
         self._url_add_helper("/urls/urls", url)
-    def add_kickstart_url(self, url):
-        self._url_add_helper("/urls/kickstarts", url)
     def add_iso_path(self, path):
         self._url_add_helper("/urls/isos", path)
 
     def get_media_urls(self):
         return self.conf.get("/urls/urls")
-    def get_kickstart_urls(self):
-        return self.conf.get("/urls/kickstarts")
     def get_iso_paths(self):
         return self.conf.get("/urls/isos")
 
diff --git a/virtManager/create.py b/virtManager/create.py
index 299214ab6..68daed422 100644
--- a/virtManager/create.py
+++ b/virtManager/create.py
@@ -286,11 +286,6 @@ class vmmCreate(vmmGObjectUI):
         media_url_list.set_model(media_url_model)
         media_url_list.set_entry_text_column(0)
 
-        ks_url_list = self.widget("install-ks-combo")
-        ks_url_model = Gtk.ListStore(str)
-        ks_url_list.set_model(ks_url_model)
-        ks_url_list.set_entry_text_column(0)
-
         def sep_func(model, it, combo):
             ignore = combo
             return model[it][OS_COL_IS_SEP]
@@ -400,13 +395,10 @@ class vmmCreate(vmmGObjectUI):
 
         # Install URL
         self.widget("install-urlopts-entry").set_text("")
-        self.widget("install-ks-entry").set_text("")
         self.widget("install-url-entry").set_text("")
         self.widget("install-url-options").set_expanded(False)
         urlmodel = self.widget("install-url-combo").get_model()
-        ksmodel  = self.widget("install-ks-combo").get_model()
         _populate_media_model(urlmodel, self.config.get_media_urls())
-        _populate_media_model(ksmodel, self.config.get_kickstart_urls())
         self._set_distro_labels("-", "-")
 
         # Install import
@@ -1193,14 +1185,11 @@ class vmmCreate(vmmGObjectUI):
     def _get_config_url_info(self, store_media=False):
         media = self.widget("install-url-entry").get_text().strip()
         extra = self.widget("install-urlopts-entry").get_text().strip()
-        ks = self.widget("install-ks-entry").get_text().strip()
 
         if media and store_media:
             self.config.add_media_url(media)
-        if ks and store_media:
-            self.config.add_kickstart_url(ks)
 
-        return (media.strip(), extra.strip(), ks.strip())
+        return (media.strip(), extra.strip())
 
     def _get_config_import_path(self):
         return self.widget("install-import-entry").get_text()
@@ -1743,7 +1732,6 @@ class vmmCreate(vmmGObjectUI):
         installer = None
         location = None
         extra = None
-        ks = None
         cdrom = False
         is_import = False
         init = None
@@ -1766,7 +1754,7 @@ class vmmCreate(vmmGObjectUI):
 
         elif instmethod == INSTALL_PAGE_URL:
             instclass = virtinst.DistroInstaller
-            media, extra, ks = self._get_config_url_info()
+            media, extra = self._get_config_url_info()
 
             if not media:
                 return self.err.val_err(_("An install tree is required."))
@@ -1821,8 +1809,6 @@ class vmmCreate(vmmGObjectUI):
             extraargs = ""
             if extra:
                 extraargs += extra
-            if ks:
-                extraargs += " ks=%s" % ks
 
             if extraargs:
                 self._guest.installer.extraargs = extraargs