mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-10-27 18:55:29 +03:00
Kickstart arg is optional, URL is required -- it's not either/or like we thought.
This commit is contained in:
Hugh O. Brock
parent
87748285a1
commit
842329aa88
@ -6530,7 +6530,7 @@ TB</property>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label205">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Please indicate where installation media is available for the operating system you would like to install on this <b>paravirtualized</b> virtual system:</property>
|
||||
<property name="label" translatable="yes">Please indicate where installation media is available for the operating system you would like to install on this <b>paravirtualized</b> virtual system. Optionally you can provide the URL for a kickstart file that describes your system:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
@ -6567,8 +6567,8 @@ TB</property>
|
||||
<child>
|
||||
<widget class="GtkTable" id="table21">
|
||||
<property name="visible">True</property>
|
||||
<property name="n_rows">7</property>
|
||||
<property name="n_columns">4</property>
|
||||
<property name="n_rows">5</property>
|
||||
<property name="n_columns">3</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="row_spacing">2</property>
|
||||
<property name="column_spacing">0</property>
|
||||
@ -6592,8 +6592,8 @@ TB</property>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options">fill</property>
|
||||
</packing>
|
||||
@ -6619,10 +6619,10 @@ TB</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
@ -6677,10 +6677,10 @@ TB</property>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="right_attach">4</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
</packing>
|
||||
</child>
|
||||
@ -6705,10 +6705,10 @@ TB</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">5</property>
|
||||
<property name="bottom_attach">6</property>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">3</property>
|
||||
<property name="bottom_attach">4</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
@ -6762,77 +6762,12 @@ TB</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="right_attach">4</property>
|
||||
<property name="top_attach">6</property>
|
||||
<property name="bottom_attach">7</property>
|
||||
<property name="x_options">fill</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label288">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"> </property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">3</property>
|
||||
<property name="bottom_attach">4</property>
|
||||
<property name="top_attach">4</property>
|
||||
<property name="bottom_attach">5</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment72">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="media-url-tree">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">_Install Media URL (http/ftp/nfs):</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">True</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_media_toggled" last_modification_time="Wed, 09 Aug 2006 21:54:46 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">4</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options">fill</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
@ -6849,74 +6784,25 @@ TB</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkRadioButton" id="media-url-ks">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">_Kickstart URL (http/ftp/nsf):</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">True</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<property name="group">media-url-tree</property>
|
||||
<signal name="toggled" handler="on_media_toggled" last_modification_time="Wed, 09 Aug 2006 21:54:33 GMT"/>
|
||||
</widget>
|
||||
<placeholder/>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">4</property>
|
||||
<property name="top_attach">4</property>
|
||||
<property name="bottom_attach">5</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options">fill</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment115">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="pv-media-url">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char">•</property>
|
||||
<property name="activates_default">False</property>
|
||||
<signal name="focus_out_event" handler="on_pv_media_url_focus_out_event" last_modification_time="Thu, 10 Aug 2006 16:20:58 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="right_attach">4</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment116">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
@ -6939,10 +6825,48 @@ TB</property>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="right_attach">4</property>
|
||||
<property name="top_attach">5</property>
|
||||
<property name="bottom_attach">6</property>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">3</property>
|
||||
<property name="bottom_attach">4</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment115">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkEntry" id="pv-media-url">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="has_focus">True</property>
|
||||
<property name="editable">True</property>
|
||||
<property name="visibility">True</property>
|
||||
<property name="max_length">0</property>
|
||||
<property name="text" translatable="yes"></property>
|
||||
<property name="has_frame">True</property>
|
||||
<property name="invisible_char">•</property>
|
||||
<property name="activates_default">False</property>
|
||||
<signal name="focus_out_event" handler="on_pv_media_url_focus_out_event" last_modification_time="Thu, 10 Aug 2006 16:20:58 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
|
||||
@ -33,9 +33,6 @@ VM_FULLY_VIRT = 2
|
||||
VM_INSTALL_FROM_ISO = 1
|
||||
VM_INSTALL_FROM_CD = 2
|
||||
|
||||
VM_INSTALL_FROM_URL = 1
|
||||
VM_INSTALL_FROM_KS_URL = 2
|
||||
|
||||
VM_STORAGE_PARTITION = 1
|
||||
VM_STORAGE_FILE = 2
|
||||
|
||||
@ -61,7 +58,7 @@ class vmmCreate(gobject.GObject):
|
||||
"on_fv_iso_location_browse_clicked" : self.browse_iso_location,
|
||||
"on_fv_iso_location_focus_out_event" : self.set_media_address,
|
||||
"on_pv_media_url_focus_out_event" : self.set_media_address,
|
||||
"on_pv_ks_url_focus_out_event" : self.set_media_address,
|
||||
"on_pv_ks_url_focus_out_event" : self.set_kickstart_address,
|
||||
"on_storage_partition_address_focus_out_event" : self.set_storage_address,
|
||||
"on_storage_file_address_focus_out_event" : self.set_storage_address,
|
||||
"on_storage_partition_address_browse_clicked" : self.browse_storage_partition_address,
|
||||
@ -82,13 +79,9 @@ class vmmCreate(gobject.GObject):
|
||||
#the dahta
|
||||
self.vm_name = None
|
||||
self.virt_method = VM_PARAVIRT
|
||||
|
||||
# having two install-media fields is strange, but eliminates
|
||||
# some spaghetti in the UI
|
||||
self.install_fv_media_type = VM_INSTALL_FROM_ISO
|
||||
self.install_pv_media_type = VM_INSTALL_FROM_URL
|
||||
|
||||
self.install_media_address = None
|
||||
self.install_kickstart_address = None
|
||||
self.storage_method = VM_STORAGE_PARTITION
|
||||
self.storage_address = None
|
||||
self.storage_file_size = None
|
||||
@ -159,10 +152,12 @@ class vmmCreate(gobject.GObject):
|
||||
|
||||
elif page_number == 1:
|
||||
#set up the system-name page
|
||||
name_widget = self.window.get_widget("create-vm-name")
|
||||
if self.vm_name != None:
|
||||
self.window.get_widget("create-vm-name").set_text(self.vm_name)
|
||||
name_widget.set_text(self.vm_name)
|
||||
else:
|
||||
self.window.get_widget("create-vm-name").set_text("")
|
||||
name_widget.set_text("")
|
||||
name_widget.grab_focus()
|
||||
|
||||
elif page_number == 2:
|
||||
#set up the virt method page
|
||||
@ -186,14 +181,17 @@ class vmmCreate(gobject.GObject):
|
||||
|
||||
elif page_number == 4:
|
||||
#set up the pv install media page
|
||||
if self.install_pv_media_type == VM_INSTALL_FROM_URL:
|
||||
self.window.get_widget("media-url-tree").set_active(True)
|
||||
self.window.get_widget("pv-media-url").set_sensitive(True)
|
||||
self.window.get_widget("pv-ks-url").set_sensitive(False)
|
||||
url_widget = self.window.get_widget("pv-media-url")
|
||||
ks_widget = self.window.get_widget("pv-ks-url")
|
||||
if self.install_media_address != None:
|
||||
url_widget.set_text(self.install_media_address)
|
||||
else:
|
||||
self.window.get_widget("media-url-ks").set_active(True)
|
||||
self.window.get_widget("pv-media-url").set_sensitive(False)
|
||||
self.window.get_widget("pv-ks-url").set_sensitive(True)
|
||||
url_widget.set_text("")
|
||||
if self.install_kickstart_address != None:
|
||||
ks_widget.set_text(self.install_kickstart_address)
|
||||
else:
|
||||
ks_widget.set_text("")
|
||||
url_widget.grab_focus()
|
||||
|
||||
elif page_number == 5:
|
||||
#set up the storage space page
|
||||
@ -239,7 +237,7 @@ class vmmCreate(gobject.GObject):
|
||||
# XXX the validation doesn't really go here
|
||||
if self.vm_name == None: self.vm_name = "No Name"
|
||||
|
||||
congrats.set_text(_("Congratulations, you have successfully created a new virtual system, <b>\"%s\"</b>. \n\You'll now be able to view and work with \"%s\" in the virtual machine manager.") % (self.vm_name, self.vm_name) )
|
||||
congrats.set_text(_("Congratulations, you have successfully created a new virtual system, <b>\"%s\"</b>. \nYou'll now be able to view and work with \"%s\" in the virtual machine manager.") % (self.vm_name, self.vm_name) )
|
||||
congrats.set_use_markup(True)
|
||||
self.window.get_widget("create-forward").hide()
|
||||
self.window.get_widget("create-finish").show()
|
||||
@ -249,11 +247,18 @@ class vmmCreate(gobject.GObject):
|
||||
return 1
|
||||
|
||||
def finish(self, ignore=None):
|
||||
#for debugging
|
||||
if self.install_kickstart_address == None:
|
||||
ks = "None"
|
||||
else:
|
||||
ks = self.install_kickstart_address
|
||||
|
||||
|
||||
print "your vm properties: \n Name=" + self.vm_name + \
|
||||
"\n Virt method: " + `self.virt_method` + \
|
||||
"\n Install media type (fv): " + `self.install_fv_media_type` + \
|
||||
"\n Install media type (pv): " + `self.install_pv_media_type` + \
|
||||
"\n Install media address: " + self.install_media_address + \
|
||||
"\n Install kickstart address: " + ks + \
|
||||
"\n Install storage type: " + `self.storage_method` + \
|
||||
"\n Install storage address: " + self.storage_address + \
|
||||
"\n Install storage file size: " + `self.storage_file_size/1024` + \
|
||||
@ -276,8 +281,8 @@ class vmmCreate(gobject.GObject):
|
||||
self.install_media_address = None
|
||||
else:
|
||||
guest = xeninst.ParaVirtGuest()
|
||||
if self.install_pv_media_type == VM_INSTALL_FROM_KS_URL:
|
||||
guest.extraargs = "ks=%s" % self.install_pv_media_type
|
||||
if self.install_kickstart_address != None:
|
||||
guest.extraargs = "ks=%s" % self.install_kickstart_address
|
||||
try:
|
||||
guest.location = self.install_media_address
|
||||
except ValueError, e:
|
||||
@ -346,14 +351,6 @@ class vmmCreate(gobject.GObject):
|
||||
elif button.name == "media-physical":
|
||||
self.install_fv_media_type = VM_INSTALL_FROM_CD
|
||||
self.window.get_widget("fv-iso-location-box").set_sensitive(False)
|
||||
elif button.name == "media-url-tree":
|
||||
self.install_pv_media_type = VM_INSTALL_FROM_URL
|
||||
self.window.get_widget("pv-media-url").set_sensitive(True)
|
||||
self.window.get_widget("pv-ks-url").set_sensitive(False)
|
||||
else:
|
||||
self.install_pv_media_type = VM_INSTALL_FROM_KS_URL
|
||||
self.window.get_widget("pv-media-url").set_sensitive(False)
|
||||
self.window.get_widget("pv-ks-url").set_sensitive(True)
|
||||
|
||||
def browse_iso_location(self, ignore1=None, ignore2=None):
|
||||
self.install_media_address = self._browse_file(_("Locate ISO Image"))
|
||||
@ -383,6 +380,9 @@ class vmmCreate(gobject.GObject):
|
||||
def set_media_address(self, src, ignore=None):
|
||||
self.install_media_address = src.get_text()
|
||||
|
||||
def set_kickstart_address(self, src, ignore=None):
|
||||
self.install_kickstart_address = src.get_text()
|
||||
|
||||
def set_storage_address(self, src, ignore=None):
|
||||
self.storage_address = src.get_text()
|
||||
|
||||
@ -464,8 +464,8 @@ class vmmCreate(gobject.GObject):
|
||||
|
||||
elif page_num == 4: # the paravirt media page
|
||||
if self.install_media_address == None or len(self.install_media_address) == 0:
|
||||
self._validation_error_box(_("URL or Kickstart Location Required"), \
|
||||
_("You must specify a URL or a kickstart address for the guest install"))
|
||||
self._validation_error_box(_("URL Required"), \
|
||||
_("You must specify a URL for the install image for the guest install"))
|
||||
return False
|
||||
|
||||
elif page_num == 5: # the storage page
|
||||
|
||||
Loading…
Reference in New Issue
Block a user