mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
create: Drop explicit kickstart UI
Few users actually use this, and they can easily do it with the kernel options field.
This commit is contained in:
Cole Robinson
parent
4f9fd84f8f
commit
2178cc8c93
36
ui/create.ui
36
ui/create.ui
@ -927,24 +927,9 @@ bar</property>
|
|||||||
<object class="GtkTable" id="table7">
|
<object class="GtkTable" id="table7">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="n_rows">2</property>
|
|
||||||
<property name="n_columns">2</property>
|
<property name="n_columns">2</property>
|
||||||
<property name="column_spacing">6</property>
|
<property name="column_spacing">6</property>
|
||||||
<property name="row_spacing">4</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>
|
<child>
|
||||||
<object class="GtkLabel" id="label26">
|
<object class="GtkLabel" id="label26">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
@ -955,8 +940,6 @@ bar</property>
|
|||||||
<property name="xalign">1</property>
|
<property name="xalign">1</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="top_attach">1</property>
|
|
||||||
<property name="bottom_attach">2</property>
|
|
||||||
<property name="x_options">GTK_FILL</property>
|
<property name="x_options">GTK_FILL</property>
|
||||||
<property name="y_options"/>
|
<property name="y_options"/>
|
||||||
</packing>
|
</packing>
|
||||||
@ -967,25 +950,6 @@ bar</property>
|
|||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="invisible_char">•</property>
|
<property name="invisible_char">•</property>
|
||||||
</object>
|
</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>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left_attach">1</property>
|
||||||
<property name="right_attach">2</property>
|
<property name="right_attach">2</property>
|
||||||
|
|||||||
@ -551,15 +551,11 @@ class vmmConfig(object):
|
|||||||
|
|
||||||
def add_media_url(self, url):
|
def add_media_url(self, url):
|
||||||
self._url_add_helper("/urls/urls", 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):
|
def add_iso_path(self, path):
|
||||||
self._url_add_helper("/urls/isos", path)
|
self._url_add_helper("/urls/isos", path)
|
||||||
|
|
||||||
def get_media_urls(self):
|
def get_media_urls(self):
|
||||||
return self.conf.get("/urls/urls")
|
return self.conf.get("/urls/urls")
|
||||||
def get_kickstart_urls(self):
|
|
||||||
return self.conf.get("/urls/kickstarts")
|
|
||||||
def get_iso_paths(self):
|
def get_iso_paths(self):
|
||||||
return self.conf.get("/urls/isos")
|
return self.conf.get("/urls/isos")
|
||||||
|
|
||||||
|
|||||||
@ -286,11 +286,6 @@ class vmmCreate(vmmGObjectUI):
|
|||||||
media_url_list.set_model(media_url_model)
|
media_url_list.set_model(media_url_model)
|
||||||
media_url_list.set_entry_text_column(0)
|
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):
|
def sep_func(model, it, combo):
|
||||||
ignore = combo
|
ignore = combo
|
||||||
return model[it][OS_COL_IS_SEP]
|
return model[it][OS_COL_IS_SEP]
|
||||||
@ -400,13 +395,10 @@ class vmmCreate(vmmGObjectUI):
|
|||||||
|
|
||||||
# Install URL
|
# Install URL
|
||||||
self.widget("install-urlopts-entry").set_text("")
|
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-entry").set_text("")
|
||||||
self.widget("install-url-options").set_expanded(False)
|
self.widget("install-url-options").set_expanded(False)
|
||||||
urlmodel = self.widget("install-url-combo").get_model()
|
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(urlmodel, self.config.get_media_urls())
|
||||||
_populate_media_model(ksmodel, self.config.get_kickstart_urls())
|
|
||||||
self._set_distro_labels("-", "-")
|
self._set_distro_labels("-", "-")
|
||||||
|
|
||||||
# Install import
|
# Install import
|
||||||
@ -1193,14 +1185,11 @@ class vmmCreate(vmmGObjectUI):
|
|||||||
def _get_config_url_info(self, store_media=False):
|
def _get_config_url_info(self, store_media=False):
|
||||||
media = self.widget("install-url-entry").get_text().strip()
|
media = self.widget("install-url-entry").get_text().strip()
|
||||||
extra = self.widget("install-urlopts-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:
|
if media and store_media:
|
||||||
self.config.add_media_url(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):
|
def _get_config_import_path(self):
|
||||||
return self.widget("install-import-entry").get_text()
|
return self.widget("install-import-entry").get_text()
|
||||||
@ -1743,7 +1732,6 @@ class vmmCreate(vmmGObjectUI):
|
|||||||
installer = None
|
installer = None
|
||||||
location = None
|
location = None
|
||||||
extra = None
|
extra = None
|
||||||
ks = None
|
|
||||||
cdrom = False
|
cdrom = False
|
||||||
is_import = False
|
is_import = False
|
||||||
init = None
|
init = None
|
||||||
@ -1766,7 +1754,7 @@ class vmmCreate(vmmGObjectUI):
|
|||||||
|
|
||||||
elif instmethod == INSTALL_PAGE_URL:
|
elif instmethod == INSTALL_PAGE_URL:
|
||||||
instclass = virtinst.DistroInstaller
|
instclass = virtinst.DistroInstaller
|
||||||
media, extra, ks = self._get_config_url_info()
|
media, extra = self._get_config_url_info()
|
||||||
|
|
||||||
if not media:
|
if not media:
|
||||||
return self.err.val_err(_("An install tree is required."))
|
return self.err.val_err(_("An install tree is required."))
|
||||||
@ -1821,8 +1809,6 @@ class vmmCreate(vmmGObjectUI):
|
|||||||
extraargs = ""
|
extraargs = ""
|
||||||
if extra:
|
if extra:
|
||||||
extraargs += extra
|
extraargs += extra
|
||||||
if ks:
|
|
||||||
extraargs += " ks=%s" % ks
|
|
||||||
|
|
||||||
if extraargs:
|
if extraargs:
|
||||||
self._guest.installer.extraargs = extraargs
|
self._guest.installer.extraargs = extraargs
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user