Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at Tue May 24 14:16:40 CEST 2011.
--------
--- vm-install/vm-install.changes 2011-05-12 00:02:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2011-05-23
18:51:18.000000000 +0200
@@ -1,0 +2,16 @@
+Mon May 23 10:48:46 MDT 2011 - carn...@novell.com
+
+- bnc#695318 - Xen/vm-install:failed to install new machine
+
+-------------------------------------------------------------------
+Wed May 18 10:57:23 MDT 2011 - carn...@novell.com
+
+- Allow an optional PXE server IP to be passed with the command
+ line pxe flag.
+
+-------------------------------------------------------------------
+Tue May 17 06:47:10 MDT 2011 - carn...@novell.com
+
+- Updated language files for hr.po, it.po and fi.po
+
+-------------------------------------------------------------------
@@ -61 +77 @@
-- Fate#311004: Support Direct Kernel Booting in KVM
+- fate#311004: Support Direct Kernel Booting in KVM
calling whatdependson for head-i586
Old:
----
vm-install-0.5.3.tar.bz2
New:
----
vm-install-0.5.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.ZTme7g/_old 2011-05-24 14:05:55.000000000 +0200
+++ /var/tmp/diff_new_pack.ZTme7g/_new 2011-05-24 14:05:55.000000000 +0200
@@ -26,10 +26,10 @@
License: GPLv2+
Group: System/Emulators/PC
AutoReqProv: yes
-Version: 0.5.3
+Version: 0.5.4
Release: 1
Summary: Tool to Define a Virtual Machine and Install Its Operating
System
-Source0: %{name}-0.5.3.tar.bz2
+Source0: %{name}-0.5.4.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
Requires: libvirt python-urlgrabber libxml2-python libvirt-python
virt-utils udhcp tftp
++++++ vm-install-0.5.3.tar.bz2 -> vm-install-0.5.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/Makefile
new/vm-install-0.5.4/Makefile
--- old/vm-install-0.5.3/Makefile 2011-05-11 19:26:02.000000000 +0200
+++ new/vm-install-0.5.4/Makefile 2011-05-18 18:58:29.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.5.3
+VER = 0.5.4
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/bin/vm-install
new/vm-install-0.5.4/bin/vm-install
--- old/vm-install-0.5.3/bin/vm-install 2011-04-13 18:26:19.000000000 +0200
+++ new/vm-install-0.5.4/bin/vm-install 2011-05-23 18:25:48.000000000 +0200
@@ -83,6 +83,21 @@
if connection:
parser.values.connect = connection
+def setPXE(option, opt_str, value, parser):
+ parser.values.pxe_boot = True
+ if len(parser.rargs) and not parser.rargs[0].startswith('-'):
+ address = parser.rargs[0]
+ parts = address.split(".")
+ if len(parts) == 4:
+ for item in parts:
+ try:
+ if not 0 <= int(item) <= 255:
+ return
+ except ValueError, e:
+ print >> sys.stderr, '%s: %s' % (vminstall.msg.error,
str(e))
+ sys.exit(-1)
+ parser.values.pxe_addr = address
+
def populate_options(options):
parser = optparse.OptionParser(description="""Defines a Xen virtual
machine and installs its operating system. Consult the man page for complete
usage and examples.""")
@@ -96,8 +111,6 @@
if o == '-o' or o == '--os-type':
found = True
- parser.add_option('-a', '--audio', type='string',
- help="audio hardware; one of 'ac97', 'all', 'es1370',
'ich6', 'none', 'sb16'")
parser.add_option('-c', '--vcpus', type='int', dest='vcpus',
help="number of virtual CPUs")
parser.add_option('', '--cpuid', type='string', action='callback',
callback=setCPUID,
@@ -112,6 +125,8 @@
help="graphics hardware; one of 'cirrus', 'none',
'para', 'vesa'")
parser.add_option('', '--graphics-viewer', type='string',
help="graphics viewer; one of 'text', 'sdl', 'vnc', or
'virt-viewer'")
+ parser.add_option('', '--sound', type='string',
+ help="sound hardware; one of 'ac97', 'all', 'es1370',
'ich6', 'none', 'sb16'")
parser.add_option('-m', '--memory', type='int', dest='memoryMB',
metavar='MEGABYTES',
help="initial MB of RAM for VM")
parser.add_option('-M', '--max-memory', type='int', dest='max_memoryMB',
metavar='MEGABYTES',
@@ -143,10 +158,10 @@
help="additional arguments for the paravirtualized
kernel")
parser.add_option('-s', '--source', type='string', dest='source',
help="URL of installation source for paravirtualized VM")
- parser.add_option('-p', '--pxe-boot', action="store_true", dest="pxe_boot",
- help="Specify PXE booting for the VM")
- parser.add_option('', '--no-direct-kernel-boot', action="store_false",
dest="direct_kernel_boot",
- help="Do not use Direct Kernel Booting for the Linux VM")
+ parser.add_option('-p', '--pxe-boot', action='callback', callback=setPXE,
+ help="Specify PXE booting for the VM: [PXE Server IP]")
+ parser.add_option('', '--direct-kernel-boot', action="store_true",
dest="direct_kernel_boot",
+ help="Use Direct Kernel Booting for the Linux VM")
parser.add_option('', '--config-dir', type='string',
help="Specify the directory to store VM configuration
files")
parser.add_option('', '--upgrade', action="store_true", dest="upgrade",
@@ -226,7 +241,6 @@
raise HypervisorError(HypervisorError.E_NO_HYPERVISOR)
except Error, e:
print >> sys.stderr, '%s: %s' % (vminstall.msg.error, str(e))
- r = e.exit_code()
sys.exit(r)
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/glade/vm-install.glade
new/vm-install-0.5.4/glade/vm-install.glade
--- old/vm-install-0.5.3/glade/vm-install.glade 2011-04-29 21:38:50.000000000
+0200
+++ new/vm-install-0.5.4/glade/vm-install.glade 2011-05-23 18:20:01.000000000
+0200
@@ -3206,7 +3206,7 @@
</child>
<child>
- <widget class="GtkAlignment" id="audio-alignment">
+ <widget class="GtkAlignment" id="sound-alignment">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -3249,9 +3249,9 @@
</child>
<child>
- <widget class="GtkLabel" id="audio_help">
+ <widget class="GtkLabel" id="sound_help">
<property name="visible">True</property>
- <property name="label"
translatable="yes">audio_hw_help</property>
+ <property name="label"
translatable="yes">sound_hw_help</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3295,9 +3295,9 @@
<property name="column_spacing">10</property>
<child>
- <widget class="GtkLabel" id="audio-label">
+ <widget class="GtkLabel" id="sound-label">
<property name="visible">True</property>
- <property name="label"
translatable="yes">audio</property>
+ <property name="label"
translatable="yes">sound</property>
<property
name="use_underline">False</property>
<property name="use_markup">False</property>
<property
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3323,12 +3323,12 @@
</child>
<child>
- <widget class="GtkComboBox" id="audio-combobox">
+ <widget class="GtkComboBox" id="sound-combobox">
<property name="visible">True</property>
<property name="items"
translatable="yes">en_us</property>
<property name="add_tearoffs">False</property>
<property
name="focus_on_click">True</property>
- <signal name="changed"
handler="on_audio_changed" last_modification_time="Mon, 11 Apr 2011 16:33:31
GMT"/>
+ <signal name="changed"
handler="on_sound_changed" last_modification_time="Mon, 11 Apr 2011 16:33:31
GMT"/>
</widget>
<packing>
<property name="left_attach">1</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/man/vm-install.8
new/vm-install-0.5.4/man/vm-install.8
--- old/vm-install-0.5.3/man/vm-install.8 2011-04-04 18:25:45.000000000
+0200
+++ new/vm-install-0.5.4/man/vm-install.8 2011-05-18 19:00:59.000000000
+0200
@@ -208,7 +208,8 @@
.RE
.B -p\fR, \fB--pxe-boot\fR
-Specify PXE booting for the VM installation.
+Specify PXE booting for the VM installation. An optional PXE IP server
+address may be specified.
.TP
.B -x\fR \fITEXT\fR, \fB--extra-args\fR \fITEXT\fR
Additional arguments to pass to the paravirtualized OS. Note that the tool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/po/fi.po
new/vm-install-0.5.4/po/fi.po
--- old/vm-install-0.5.3/po/fi.po 2011-03-16 00:30:10.000000000 +0100
+++ new/vm-install-0.5.4/po/fi.po 2011-05-17 14:54:31.000000000 +0200
@@ -6,13 +6,13 @@
# Jami Saarikoski <jami.saariko...@opensuse.fi>, 2009.
# Jyri Palokangas <j...@opensuse.org>, 2010.
# Katariina Kemppainen <katariin...@yahoo.se>, 2010.
-# Katariina Kemppainen <katari...@opensuse.fi>, 2010.
+# Katariina Kemppainen <katari...@opensuse.fi>, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: xen-vm-install.fi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-26 12:46-0600\n"
-"PO-Revision-Date: 2010-11-03 16:17+0200\n"
+"PO-Revision-Date: 2011-03-06 18:00+0200\n"
"Last-Translator: Katariina Kemppainen <katari...@opensuse.fi>\n"
"Language-Team: Finnish <kde-i18n-...@kde.org>\n"
"Language: fi\n"
@@ -44,7 +44,7 @@
#: src/vminstall/msg.py:27
msgid "The 'kernel-xen' and 'install-initrd' packages were not found."
-msgstr "'kernel-xen' ja 'install-initrd' -paketteja ei löytynyt."
+msgstr "\"kernel-xen\"- ja \"install-initrd\" -paketteja ei löytynyt."
#. TRANSLATORS Do not translate %(tag)s
#: src/vminstall/msg.py:29
@@ -182,7 +182,7 @@
#: src/vminstall/msg.py:76
msgid "A CD-ROM or DVD must be specified from which to boot."
-msgstr "CD-ROM tai DVD-levy on määritettävä käynnistystä varten."
+msgstr "CD-ROM- tai DVD-levy on määritettävä käynnistystä varten."
#: src/vminstall/msg.py:77
msgid "An error occurred while reading the configuration file."
@@ -194,11 +194,11 @@
#: src/vminstall/msg.py:81
msgid "The processor(s) in this machine do not support full virtualization."
-msgstr "Tämän tietokoneen prosessori(t) eivät tue täyttä virtuaalisointia."
+msgstr "Tämän tietokoneen prosessori(t) eivät tue täyttä virtualisointia."
#: src/vminstall/msg.py:82
msgid "The processor(s) in this machine support full virtualization, but it is
disabled in the BIOS."
-msgstr "Tämän tietokoneen prosessori(t) tukevat täyttä virtuaalisointia, mutta
ominaisuus on poistettu käynnistä BIOSista."
+msgstr "Tämän tietokoneen prosessori(t) tukevat täyttä virtualisointia, mutta
ominaisuus on poistettu BIOSista."
#: src/vminstall/msg.py:85
msgid "Not enough memory."
@@ -250,7 +250,7 @@
#: src/vminstall/msg.py:103
msgid "The operating system does not support paravirtualization."
-msgstr "Käyttöjärjestelmä ei tue paravirtuaalisointia."
+msgstr "Käyttöjärjestelmä ei tue paravirtualisointia."
#: src/vminstall/msg.py:104
msgid "The operating system does not support automated installations."
@@ -258,7 +258,7 @@
#: src/vminstall/msg.py:105
msgid "The operating system does not support full virtualization."
-msgstr "Käyttöjärjestelmä ei tue täyttä virtuaalisointia."
+msgstr "Käyttöjärjestelmä ei tue täyttä virtualisointia."
#: src/vminstall/msg.py:106
msgid "The operating system cannot be upgraded from this tool."
@@ -443,19 +443,19 @@
#: src/vminstall/msg.py:159
msgid "Paravirtualized"
-msgstr "Paravirtuaalisoitu"
+msgstr "Paravirtualisoitu"
#: src/vminstall/msg.py:160
msgid "Fully virtualized"
-msgstr "Täysin virtuaalisoitu"
+msgstr "Täysin virtualisoitu"
#: src/vminstall/msg.py:161
msgid "Paravirtualization"
-msgstr "Paravirtuaalisointi"
+msgstr "Paravirtualisointi"
#: src/vminstall/msg.py:162
msgid "Full virtualization"
-msgstr "Täysi virtuaalisointi"
+msgstr "Täysi virtualisointi"
#: src/vminstall/msg.py:163
msgid "Name"
@@ -528,7 +528,7 @@
#: src/vminstall/msg.py:182
msgid "Virtualization Method"
-msgstr "Virtuaalisointimenetelmä"
+msgstr "Virtualisointimenetelmä"
# /opt/kde3/share/applnk/System/ScreenSavers/KVm.desktop
#: src/vminstall/msg.py:183
@@ -585,7 +585,7 @@
#: src/vminstall/msg.py:198
msgid "Whether the VM will be <b>fully virtualized</b> or
<b>paravirtualized</b>"
-msgstr "tiedon siitä, onko kone <b>täysin virtuaalisoitu</b> vai
<b>paravirtuaalisoitu</b>"
+msgstr "tiedon siitä, onko kone <b>täysin virtualisoitu</b> vai
<b>paravirtualisoitu</b>"
#: src/vminstall/msg.py:199
msgid "The <b>location</b> of the files necessary to install an operating
system on the VM, or a <b>disk</b> that already has an operating system"
@@ -599,7 +599,7 @@
#: src/vminstall/msg.py:202
#, python-format
msgid "For the most current information on Novell VM server technology, see
%(url)s"
-msgstr "Uusimpia tietoja Novell VM-palvelinteknologiassa on sivuilla %(url)s"
+msgstr "Viimeisimmät tiedot Novellin VM-palvelinteknologiasta, katso %(url)s"
#: src/vminstall/msg.py:203
msgid "If you are creating this VM from scratch, you will need to install an
operating system. When migrating a physical machine to a virtual machine, the
disk with the existing operating system can often be reused for the VM."
@@ -627,11 +627,11 @@
#: src/vminstall/msg.py:209
msgid "Virtual machines can use paravirtualization or full virtualization.
Paravirtualization is faster but requires operating system support. Full
virtualization runs a broader range of operating systems but requires hardware
support. Which do you prefer?"
-msgstr "Virtuaalikoneet voivat käyttää paravirtuaalisointia tai täyttä
virtuaalisointia. Paravirtuaalisointi on nopeampi tekniikka, mutta se
edellyttää käyttöjärjestelmän tukea. Täysi virtuaalisointi soveltuu useampien
käyttöjärjestelmien suorittamiseen, mutta edellyttää laitteistotukea. Kumpaa
menetelmää haluat käyttää?"
+msgstr "Virtuaalikoneet voivat käyttää paravirtualisointia tai täyttä
virtualisointia. Paravirtualisointi on nopeampi tekniikka, mutta se edellyttää
käyttöjärjestelmän tukea. Täysi virtualisointi soveltuu useampien
käyttöjärjestelmien suorittamiseen, mutta edellyttää laitteistotukea. Kumpaa
menetelmää haluat käyttää?"
#: src/vminstall/msg.py:210
msgid "Please specify the type of operating system that will run within the
virtual machine. This defines many defaults, and helps decide how to start
paravirtualized operating systems."
-msgstr "Määritä virtuaalikoneessa käytettävän käyttöjärjestelmän tyyppi. Tämä
asetus määrittää useita oletusarvoja ja auttaa sen päättämisessä, kuinka
paravirtuaalisoituja käyttöjärjestelmiä käynnistetään."
+msgstr "Määritä virtuaalikoneessa käytettävän käyttöjärjestelmän tyyppi. Tämä
asetus määrittää useita oletusarvoja ja auttaa sen päättämisessä, kuinka
paravirtualisoituja käyttöjärjestelmiä käynnistetään."
#: src/vminstall/msg.py:211
msgid "Some operating systems support automating the installation by
specifying a URL or file(s). Select a directory to include multiple files."
@@ -659,7 +659,7 @@
#: src/vminstall/msg.py:221
msgid "Press 'q' or the Escape key to exit."
-msgstr "Paina 'q'- tai Esc-näppäintä lopettaaksesi."
+msgstr "Paina \"q\"- tai Esc-näppäintä lopettaaksesi."
#: src/vminstall/msg.py:222
msgid "Warning: Vm-install automatically manages these configuration settings
depending on the operating system to be installed. It is expected that you
understand clearly the consequences of enabling or disabling a particular
setting."
@@ -683,7 +683,7 @@
#: src/vminstall/msg.py:231
msgid "Paravirtualized graphics require that an appropriate driver is
installed in the operating system."
-msgstr "Paravirtuaalisoidut grafiikat edellyttävät sopivan ohjaimen
asentamista käyttöjärjestelmään."
+msgstr "Paravirtualisoidut grafiikat edellyttävät sopivan ohjaimen asentamista
käyttöjärjestelmään."
#: src/vminstall/msg.py:232
msgid "The VM will operate like a server without a monitor. You may still
access the operating system via the virtualized serial port, or through any
operating system supported services such as ssh or VNC."
@@ -691,11 +691,11 @@
#: src/vminstall/msg.py:233
msgid "Please specify the type of virtualized graphics hardware."
-msgstr "Määritä virtuaalisoidun grafiikkalaitteiston tyyppi."
+msgstr "Määritä virtualisoidun grafiikkalaitteiston tyyppi."
#: src/vminstall/msg.py:234
msgid "Paravirtualized Graphics Adapter"
-msgstr "Paravirtuaalisoitu grafiikkasovitin"
+msgstr "Paravirtualisoitu grafiikkasovitin"
#: src/vminstall/msg.py:235
msgid "VESA VGA"
@@ -740,7 +740,7 @@
#: src/vminstall/msg.py:249
msgid "CD-ROM or DVD"
-msgstr "CD-ROM tai DVD-levy"
+msgstr "CD-ROM- tai DVD-levy"
#: src/vminstall/msg.py:250
msgid "Floppy Disk"
@@ -764,31 +764,31 @@
#: src/vminstall/msg.py:257
msgid "This kernel image may not be a paravirtualized xen kernel required for
installation, Continue?"
-msgstr "Tämä ytimen kuva ei ehkä ole paravirtuaalisoitu xen-ydin, joka
tarvitaan asennusta varten. Jatketaanko?"
+msgstr "Tämä ytimen kuva ei ehkä ole paravirtualisoitu xen-ydin, joka
tarvitaan asennusta varten. Jatketaanko?"
#: src/vminstall/msg.py:260
msgid "Fully Virtualized Intel e100"
-msgstr "Täysin virtuaalisoitu Intel e100"
+msgstr "Täysin virtualisoitu Intel e100"
#: src/vminstall/msg.py:261
msgid "Fully Virtualized Intel e1000"
-msgstr "Täysin virtuaalisoitu Intel e1000"
+msgstr "Täysin virtualisoitu Intel e1000"
#: src/vminstall/msg.py:262
msgid "Fully Virtualized AMD PCnet 32"
-msgstr "Täysin virtuaalisoitu AMD PCnet 32"
+msgstr "Täysin virtualisoitu AMD PCnet 32"
#: src/vminstall/msg.py:263
msgid "Fully Virtualized NE2000 (ISA Bus)"
-msgstr "Täysin virtuaalisoitu NE2000 (ISA-väylä)"
+msgstr "Täysin virtualisoitu NE2000 (ISA-väylä)"
#: src/vminstall/msg.py:264
msgid "Fully Virtualized NE2000 (PCI Bus)"
-msgstr "Täysin virtuaalisoitu NE2000 (PCI-väylä)"
+msgstr "Täysin virtualisoitu NE2000 (PCI-väylä)"
#: src/vminstall/msg.py:265
msgid "Fully Virtualized Realtek 8139"
-msgstr "Täysin virtuaalisoitu Realtek 8139"
+msgstr "Täysin virtualisoitu Realtek 8139"
#: src/vminstall/msg.py:266
msgid "MAC Address"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/po/hr.po
new/vm-install-0.5.4/po/hr.po
--- old/vm-install-0.5.3/po/hr.po 2011-03-16 00:30:10.000000000 +0100
+++ new/vm-install-0.5.4/po/hr.po 2011-05-17 14:55:12.000000000 +0200
@@ -1,19 +1,19 @@
# translation of xen-vm-install.hr.po to Croatian
-# Krešimir Jozić <kjo...@gmail.com>, 2008, 2009.
+# Krešimir Jozić <kjo...@gmail.com>, 2008, 2009, 2011.
msgid ""
msgstr ""
"Project-Id-Version: xen-vm-install.hr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-26 12:46-0600\n"
-"PO-Revision-Date: 2009-06-29 23:19+0200\n"
+"PO-Revision-Date: 2011-04-03 12:08+0200\n"
"Last-Translator: Krešimir Jozić <kjo...@gmail.com>\n"
-"Language-Team: Croatian <h...@li.org>\n"
+"Language-Team: Croatian <kde-i18n-...@kde.org>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 1.0\n"
#: src/vminstall/msg.py:22
msgid "Installation Error"
@@ -177,10 +177,9 @@
msgstr ""
#: src/vminstall/msg.py:77
-#, fuzzy
#| msgid "Writing the configuration file"
msgid "An error occurred while reading the configuration file."
-msgstr "Zapisujem datoteku s postavkama"
+msgstr "Dogodila se greška prilikom učitavanja datoteke s postavkama."
#: src/vminstall/msg.py:80
msgid "The operating system is incompatible with the processor architecture of
this machine."
@@ -499,10 +498,9 @@
msgstr "Omogućeno"
#: src/vminstall/msg.py:175
-#, fuzzy
#| msgid "Options"
msgid "Option"
-msgstr "Izbori"
+msgstr "Izbor"
#: src/vminstall/msg.py:178
msgid "Create a Virtual Machine"
@@ -562,16 +560,14 @@
msgstr "Postavke operacijskog sustava"
#: src/vminstall/msg.py:192
-#, fuzzy
#| msgid "Operating System"
msgid "Operating System Upgrade"
-msgstr "Operacijski sustav"
+msgstr "Nadogradnja operacijskog sustava"
#: src/vminstall/msg.py:193
-#, fuzzy
#| msgid "Safe Settings"
msgid "Advanced Settings"
-msgstr "Sigurne postavke"
+msgstr "Napredne postavke"
#: src/vminstall/msg.py:196
msgid "This assistant will guide you through creating a new virtual machine
(VM). You will be asked for some information about the VM you'd like to
create, such as:"
@@ -612,10 +608,9 @@
msgstr ""
#: src/vminstall/msg.py:206
-#, fuzzy
#| msgid "I need to install an operating system."
msgid "I need to upgrade an existing operating system."
-msgstr "Moram instalirati operacijski sustav."
+msgstr "Moram nadograditi operacijski sustav."
#: src/vminstall/msg.py:207
msgid "Please choose a name for the virtual machine."
@@ -925,22 +920,19 @@
msgstr "Pretpostavljeno"
#: src/vminstall/msg.py:310
-#, fuzzy
#| msgid "Operating System"
msgid "Operating System Type"
-msgstr "Operacijski sustav"
+msgstr "Vrsta operacijskog sustava"
#: src/vminstall/msg.py:311
-#, fuzzy
#| msgid "Creating the Virtual Machine"
msgid "Managed Virtual Machines"
-msgstr "Stvaram virtualno računalo"
+msgstr ""
#: src/vminstall/msg.py:312
-#, fuzzy
#| msgid "Configuration"
msgid "Configuration File"
-msgstr "Postavke"
+msgstr "Datoteka sa postavkama"
#: src/vminstall/msg.py:313
msgid "Specify the URL containing the network installation source."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/po/it.po
new/vm-install-0.5.4/po/it.po
--- old/vm-install-0.5.3/po/it.po 2011-03-16 00:30:10.000000000 +0100
+++ new/vm-install-0.5.4/po/it.po 2011-05-17 22:05:10.000000000 +0200
@@ -730,7 +730,7 @@
# menu entry for hard disk installation
#: src/vminstall/msg.py:248
msgid "Hard Disk"
-msgstr "Disco rigido"
+msgstr "Disco fisso"
#: src/vminstall/msg.py:249
msgid "CD-ROM or DVD"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/setup.py
new/vm-install-0.5.4/setup.py
--- old/vm-install-0.5.3/setup.py 2011-05-11 19:25:54.000000000 +0200
+++ new/vm-install-0.5.4/setup.py 2011-05-18 18:58:24.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.5.3',
+ version='0.5.4',
description='Define a virtual machine and install its operating system',
author='Charles Coffing',
author_email='ccoff...@novell.com',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/ParaVirtGuest.py
new/vm-install-0.5.4/src/vminstall/ParaVirtGuest.py
--- old/vm-install-0.5.3/src/vminstall/ParaVirtGuest.py 2011-03-16
00:30:09.000000000 +0100
+++ new/vm-install-0.5.4/src/vminstall/ParaVirtGuest.py 2011-05-20
23:18:18.000000000 +0200
@@ -261,7 +261,7 @@
except Exception, e:
raise InstSrcError(InstSrcError.E_BAD,
details=e.args[0])
try:
- (kfn, ifn) = actions.getInstallImagesFromPath(options,
mountpoint, progress, nonpae)
+ (kfn, ifn) =
actions.getInstallImagesFromPath(self.options, mountpoint, progress, nonpae)
finally:
mounted_disk.unmount()
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/VMActions.py
new/vm-install-0.5.4/src/vminstall/VMActions.py
--- old/vm-install-0.5.3/src/vminstall/VMActions.py 2011-03-16
00:30:09.000000000 +0100
+++ new/vm-install-0.5.4/src/vminstall/VMActions.py 2011-05-20
23:18:18.000000000 +0200
@@ -15,14 +15,14 @@
class VMActions:
"""Actions that are specific to a particular OS type within a VM."""
- def getInstallImagesFromPath(self, root, progress=lambda f:None,
supports_32nonpae=True):
+ def getInstallImagesFromPath(self, options, root, progress=lambda f:None,
supports_32nonpae=True):
"""Locates or creates a Xen-enabled kernel and initrd under
'root' to bootstrap install.
"""
progress(1.0)
return (None, None)
- def getInstallImagesFromUrl(self, url, progress=lambda f:None,
supports_32nonpae=True):
+ def getInstallImagesFromUrl(self, options, url, progress=lambda f:None,
supports_32nonpae=True):
"""Locates or creates a Xen-enabled kernel and initrd from
'url' to bootstrap install.
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/VMDefaults.py
new/vm-install-0.5.4/src/vminstall/VMDefaults.py
--- old/vm-install-0.5.3/src/vminstall/VMDefaults.py 2011-04-30
00:09:17.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/VMDefaults.py 2011-05-23
18:22:28.000000000 +0200
@@ -94,7 +94,7 @@
return False
def direct_kernel_boot(self):
return False
- def audio(self):
+ def sound(self):
return None
class LinuxDefaults(GenericDefaults):
@@ -104,7 +104,7 @@
args.extend(['-geometry', '80x24'])
return args
def direct_kernel_boot(self):
- return True
+ return False
class RedHatDefaults(LinuxDefaults):
def group(self):
@@ -229,7 +229,7 @@
return 8
def disks(self):
return [ self._disk_template(0, self._disk_size()) ]
- def audio(self):
+ def sound(self):
if caps.is_xen():
return "all"
else:
@@ -256,7 +256,7 @@
return [ KvmNic(model='virtio') ]
else:
return [ XenNic(model='para') ]
- def audio(self):
+ def sound(self):
if caps.is_xen():
return "all"
else:
@@ -281,7 +281,7 @@
return [ KvmNic() ]
else:
return [ XenNic(model='para') ]
- def audio(self):
+ def sound(self):
if caps.is_xen():
return "all"
else:
@@ -311,7 +311,7 @@
return [ KvmNic(model='virtio') ]
else:
return [ XenNic(model='para') ]
- def audio(self):
+ def sound(self):
if caps.is_xen():
return "all"
else:
@@ -557,7 +557,7 @@
return caps.vcpu_processors(2)
def apic(self):
return True
- def audio(self):
+ def sound(self):
if caps.is_xen():
return "all"
else:
@@ -586,7 +586,7 @@
return caps.vcpu_processors(2)
def apic(self):
return True
- def audio(self):
+ def sound(self):
if caps.is_xen():
return "all"
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/VMNetWare.py
new/vm-install-0.5.4/src/vminstall/VMNetWare.py
--- old/vm-install-0.5.3/src/vminstall/VMNetWare.py 2011-03-16
00:30:09.000000000 +0100
+++ new/vm-install-0.5.4/src/vminstall/VMNetWare.py 2011-05-20
23:18:18.000000000 +0200
@@ -26,7 +26,7 @@
def _kernel(self, base):
return '%s/STARTUP/XNLOADER.SYS' % (base,)
- def getInstallImagesFromPath(self, path, progress=lambda f:None,
supports_32nonpae=True):
+ def getInstallImagesFromPath(self, options, path, progress=lambda f:None,
supports_32nonpae=True):
"""Retrieves a Xen-enabled NetWare kernel and initrd.
Retrieves a Xen-enabled NetWare kernel from the base path, and
@@ -39,7 +39,7 @@
kfd.close()
return (kfn, None)
- def getRuntimeImagesFromPath(self, root):
+ def getRuntimeImagesFromPath(self, options, root):
"""Returns a usable kernel and initrd pair found under 'root', or
(None, None) if none are found."""
kernel = '/nwserver/xnloader.sys'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/VMPXE.py
new/vm-install-0.5.4/src/vminstall/VMPXE.py
--- old/vm-install-0.5.3/src/vminstall/VMPXE.py 2011-03-16 00:30:09.000000000
+0100
+++ new/vm-install-0.5.4/src/vminstall/VMPXE.py 2011-05-20 23:18:18.000000000
+0200
@@ -44,6 +44,8 @@
return True
def getServAddr(options):
+ if options.pxe_addr:
+ return options.pxe_addr
#Can't use dhclient, which will make network unstable
#FIXME 1: is there any better method to get the dhcp server IP
#which doesn't effect network status
@@ -205,7 +207,7 @@
(k,v)=line.split()
pxe_label=v
elif (labelre.match(line)):
- (k,v)=line.split()
+ (k,v)=line.split(None,1)
labelname=v
elif (kernelre.match(line)):
(k,v)=line.split()
@@ -356,5 +358,28 @@
pxeargs += entry+' '
break
cfgfile.close()
+ ay = options.os_settings
+ if ay:
+ if ay.startswith('ftp://') or ay.startswith('tftp://') or \
+ ay.startswith('http://') or ay.startswith('nfs://'):
+ pxeargs += ' autoyast=%s' % (ay,)
+ else:
+ ay_vdev = autoyast_vdev
+ if options.os_type != 'sles11':
+ ay_vdev = 'xvdp'
+ if options.direct_kernel_boot:
+ ay_vdev = vmdisks.get_possible_vdevs(True,False)[-1]
+ # If a directory, look for either 'info' or 'autoinst.xml'
+ if os.path.isdir(ay):
+ if os.path.isfile(ay + "/info"):
+ pxeargs += ' info=disk:/info'
+ if os.path.isfile(ay + "/autoinst.xml"):
+ pxeargs += ' autoyast=device://%s/autoinst.xml' %
(ay_vdev,)
+ else:
+ # File specified, look for either 'info' or anything else
+ if ay.endswith("info"):
+ pxeargs += ' info=disk:/info'
+ else:
+ pxeargs += ' autoyast=device://%s/%s' %
(ay_vdev,os.path.basename(ay))
log.debug('Return label:%s args: %s' %(options.pxe_label, pxeargs))
return pxeargs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/VMSUSE.py
new/vm-install-0.5.4/src/vminstall/VMSUSE.py
--- old/vm-install-0.5.3/src/vminstall/VMSUSE.py 2011-04-04
17:53:44.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/VMSUSE.py 2011-05-20
23:18:18.000000000 +0200
@@ -344,7 +344,12 @@
if options.os_type != 'sles11':
ay_vdev = 'xvdp'
if options.direct_kernel_boot:
- ay_vdev = vmdisks.get_possible_vdevs(True,False)[-1]
+ virtio=False
+ if caps.is_kvm():
+ if options.os_type == 'sles11' or options.os_type ==
'sled11' or \
+ options.os_type == 'opensuse11':
+ virtio = True
+ ay_vdev = vmdisks.get_possible_vdevs(True,virtio)[-1]
# If a directory, look for either 'info' or 'autoinst.xml'
if os.path.isdir(ay):
if os.path.isfile(ay + "/info"):
@@ -388,6 +393,7 @@
def setupOsSettings(self, guest, progress=lambda f:None):
"""Creates a temporary disk image, in which to pass the autoyast
XML file."""
+ global autoyast_vdev
ay = guest.options.os_settings
if not ay or ay.startswith('ftp://') or ay.startswith('tftp://') or \
ay.startswith('http://') or ay.startswith('nfs://'):
@@ -404,8 +410,10 @@
ay_vdev = autoyast_vdev
else:
ay_vdev = autoyast_vdev
- if guest.options.os_type != 'sles11' and not
guest.options.full_virt:
+ if not guest.options.full_virt and guest.options.os_type !=
'sles11':
ay_vdev = 'xvdp'
+ elif guest.options.direct_kernel_boot:
+ ay_vdev = 'hdd'
disk = vmdisks.Disk(pdev=tmpdisk, vdev=ay_vdev, ro=True,
blocks=2048,
full_virt=guest.options.full_virt,
virtio=virtio,
vmname=guest.options.name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/audio.py
new/vm-install-0.5.4/src/vminstall/audio.py
--- old/vm-install-0.5.3/src/vminstall/audio.py 2011-04-20 22:52:29.000000000
+0200
+++ new/vm-install-0.5.4/src/vminstall/audio.py 1970-01-01 01:00:00.000000000
+0100
@@ -1,72 +0,0 @@
-# Audio Interface Card
-#
-# Copyright 2011 Novell, Inc.
-# Author:
-#
-# This software may be freely redistributed under the terms of the GNU
-# general public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-from exceptions import *
-import msg
-import caps
-
-################################################################################
-# GLOBAL DATA
-################################################################################
-
-#
-# Define a dictionary with the valid audio cards
-#
-xen_audio_cards = {
- 'none': msg.none,
- 'all': msg.audio_hw_all,
- 'ac97': msg.audio_hw_ac97,
- 'es1370': msg.audio_hw_es1370,
- 'ich6': msg.audio_hw_ich6,
- 'sb16': msg.audio_hw_sb16,
-}
-
-kvm_audio_cards = {
- 'none': msg.none,
- 'ac97': msg.audio_hw_ac97,
- 'es1370': msg.audio_hw_es1370,
- 'ich6': msg.audio_hw_ich6,
- 'sb16': msg.audio_hw_sb16,
-}
-
-################################################################################
-# GLOBAL FUNCTIONS
-################################################################################
-
-#-------------------------------------------------------------------------------
-# Function: parse_string
-# Parms:
-# card: type of audio card
-#
-# The input string is parsed and validated
-#-------------------------------------------------------------------------------
-def parse_string(card):
- if card not in audio_cards:
- raise ParamError(err=ParamError.E_INVALID, details=card)
- return card
-
-#-------------------------------------------------------------------------------
-# Function: get_audio_cards
-# Parms:
-#
-# The input string is parsed and validated
-#-------------------------------------------------------------------------------
-def get_audio_cards():
- if caps.is_xen():
- return xen_audio_cards
- else:
- return kvm_audio_cards
-
-def get_audio(current_card=None):
- if current_card is None:
- current_card = 'none'
- return get_audio_cards()[current_card]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/caps.py
new/vm-install-0.5.4/src/vminstall/caps.py
--- old/vm-install-0.5.3/src/vminstall/caps.py 2011-05-11 23:56:56.000000000
+0200
+++ new/vm-install-0.5.4/src/vminstall/caps.py 2011-05-20 23:18:18.000000000
+0200
@@ -52,8 +52,10 @@
if is_xen:
if util.is_xend_running():
cmd = '/usr/sbin/xm info | grep max_free_memory'
- else:
+ elif os.path.exists('/usr/sbin/xl'):
cmd = '/usr/sbin/xl info | grep free_memory'
+ else:
+ raise XenError(XenError.E_NO_XEN)
rfd = os.popen(cmd)
data = rfd.read()
status = rfd.close()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vm-install-0.5.3/src/vminstall/full_virt_kvm_guest.py
new/vm-install-0.5.4/src/vminstall/full_virt_kvm_guest.py
--- old/vm-install-0.5.3/src/vminstall/full_virt_kvm_guest.py 2011-03-31
21:33:37.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/full_virt_kvm_guest.py 2011-05-23
18:22:44.000000000 +0200
@@ -66,7 +66,7 @@
self._get_network_xml(),
self._get_input_xml(),
self._get_graphics_xml(),
- self._get_audio_xml(),
+ self._get_sound_xml(),
'</devices>' ],
'</domain>\n' ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vm-install-0.5.3/src/vminstall/full_virt_xen_guest.py
new/vm-install-0.5.4/src/vminstall/full_virt_xen_guest.py
--- old/vm-install-0.5.3/src/vminstall/full_virt_xen_guest.py 2011-03-31
21:36:26.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/full_virt_xen_guest.py 2011-05-23
18:23:09.000000000 +0200
@@ -123,7 +123,7 @@
self._get_disk_xml(),
self._get_network_xml(),
self._get_graphics_xml(),
- self._get_audio_xml(),
+ self._get_sound_xml(),
'</devices>' ],
'</domain>' ]
@@ -162,14 +162,14 @@
%(cpuid)s
%(cpucheck)s
%(graphics)s
-%(audio)s
+%(sound)s
%(features)s
%(mouse)s
serial="pty"
""" % { 'common': self.getCommonXen(), 'disks':
self._get_disk_xen(),
'networks': self._get_network_xen(), 'cpuid':
self._get_cpuid_xen(),
'cpucheck': self._get_cpu_check_xen(), 'qemu':
self._qemu,
- 'graphics': self._get_graphics_xen(), 'audio':
self._get_audio_xen(),
+ 'graphics': self._get_graphics_xen(), 'sound':
self._get_sound_xen(),
'features': self._get_features_xen(), 'bootdev':
bootdev,
'loader': self.options.loader, 'kernel':
self.options.kernel,
'initrd': self.options.initrd, 'mouse':
self._get_mouse_xen()}
@@ -184,13 +184,13 @@
%(cpuid)s
%(cpucheck)s
%(graphics)s
-%(audio)s
+%(sound)s
%(features)s
%(mouse)s
serial="pty"
""" % { 'common': self.getCommonXen(), 'disks': self._get_disk_xen(),
'networks': self._get_network_xen(), 'cpuid': self._get_cpuid_xen(),
'cpucheck': self._get_cpu_check_xen(),
- 'qemu': self._qemu, 'graphics': self._get_graphics_xen(), 'audio':
self._get_audio_xen(),
+ 'qemu': self._qemu, 'graphics': self._get_graphics_xen(), 'sound':
self._get_sound_xen(),
'features': self._get_features_xen(), 'bootdev': bootdev, 'loader':
self.options.loader,
'mouse': self._get_mouse_xen()}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/gtk/interface.py
new/vm-install-0.5.4/src/vminstall/gtk/interface.py
--- old/vm-install-0.5.3/src/vminstall/gtk/interface.py 2011-04-29
21:38:26.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/gtk/interface.py 2011-05-23
18:20:57.000000000 +0200
@@ -36,7 +36,7 @@
import vminstall.options
import vminstall.hypervisor
import vminstall.advanced
-import vminstall.audio
+import vminstall.sound
def strify(name):
@@ -334,8 +334,8 @@
set_text('graphics_note_none', modifier=small, markup=True)
set_text('graphics_note_para', modifier=small, markup=True)
set_text('keyboard_help', text=vminstall.msg.keyboard_hw_help)
- set_text('audio-label', text=vminstall.msg.audio, modifier=prompt)
- set_text('audio_help', text=vminstall.msg.audio_hw_help)
+ set_text('sound-label', text=vminstall.msg.sound, modifier=prompt)
+ set_text('sound_help', text=vminstall.msg.sound_hw_help)
set_text('keymap-label', text=vminstall.msg.keymap, modifier=prompt)
set_text('hardware_help')
set_text('hardware-memory-title', text=vminstall.msg.memory,
modifier=bold_prompt, markup=True)
@@ -562,6 +562,7 @@
return
src = [str(label) for label in kernel]
set_combo_from_list(combo, src)
+ combo.set_active(0)
def config_file_toggled(self, widget=None):
if not widget:
@@ -688,7 +689,7 @@
self.summary.get_widget("summary-keymap").set_text(keytable.get_keymap(self.options.keymap))
if self.defaults.full_virt:
self.summary.get_widget("sound_card_prompt").set_sensitive(True)
-
self.summary.get_widget("summary-sound-card").set_text(audio.get_audio(self.defaults.audio))
+
self.summary.get_widget("summary-sound-card").set_text(sound.get_sound(self.defaults.sound))
else:
self.summary.get_widget("sound_card_prompt").set_sensitive(False)
self.summary.get_widget("summary-sound-card").set_text("")
@@ -833,7 +834,7 @@
index = 0
combo.set_active(index)
- audio_widgets = ('audio_help', 'audio-label', 'audio-combobox')
+ sound_widgets = ('sound_help', 'sound-label', 'sound-combobox')
def show_row(row):
for name in row:
self.window.get_widget(name).show()
@@ -841,18 +842,18 @@
for name in row:
self.window.get_widget(name).hide()
if self.defaults.full_virt:
- show_row(audio_widgets)
- combo = self.window.get_widget('audio-combobox')
- ac = vminstall.audio.get_audio_cards()
- audio_cards = ac.values()
- set_combo_from_list(combo, audio_cards)
- if self.defaults.audio:
- index = audio_cards.index(ac[self.defaults.audio])
+ show_row(sound_widgets)
+ combo = self.window.get_widget('sound-combobox')
+ ac = vminstall.sound.get_sound_cards()
+ sound_cards = ac.values()
+ set_combo_from_list(combo, sound_cards)
+ if self.defaults.sound:
+ index = sound_cards.index(ac[self.defaults.sound])
else:
- index = audio_cards.index(ac['none'])
+ index = sound_cards.index(ac['none'])
combo.set_active(index)
else:
- hide_row(audio_widgets)
+ hide_row(sound_widgets)
# Page: Disks
#
elif page_number == self.pages['disks']:
@@ -1765,17 +1766,17 @@
combo = self.window.get_widget('keymap-combobox')
self.options.keymap = combo.get_active_text()
if self.defaults.full_virt:
- combo = self.window.get_widget('audio-combobox')
- audio_card = combo.get_active_text()
+ combo = self.window.get_widget('sound-combobox')
+ sound_card = combo.get_active_text()
value = 'none'
- for d, c in vminstall.audio.get_audio_cards().iteritems():
- if c == audio_card:
+ for d, c in vminstall.sound.get_sound_cards().iteritems():
+ if c == sound_card:
value = d
break
if value is 'none':
- self.options.audio = None
+ self.options.sound = None
else:
- self.options.audio = value
+ self.options.sound = value
elif page_num == self.pages['method']:
full_virt = not
self.window.get_widget('virt-method-pv').get_active()
full_virt_saved = self.options.full_virt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/kvm_guest.py
new/vm-install-0.5.4/src/vminstall/kvm_guest.py
--- old/vm-install-0.5.3/src/vminstall/kvm_guest.py 2011-05-10
15:17:57.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/kvm_guest.py 2011-05-23
18:23:22.000000000 +0200
@@ -131,10 +131,10 @@
nics.append(nic)
return nics
- def _get_audio_xml(self):
+ def _get_sound_xml(self):
ret = ''
- if self.options.audio and self.options.audio != 'none':
- ret = ["<sound model='%s'/>" % self.options.audio]
+ if self.options.sound and self.options.sound != 'none':
+ ret = ["<sound model='%s'/>" % self.options.sound]
return ret
def _get_keymap_xml(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/msg.py
new/vm-install-0.5.4/src/vminstall/msg.py
--- old/vm-install-0.5.3/src/vminstall/msg.py 2011-04-29 21:38:27.000000000
+0200
+++ new/vm-install-0.5.4/src/vminstall/msg.py 2011-05-23 18:24:16.000000000
+0200
@@ -172,7 +172,7 @@
upgrade = _("Upgrade")
protocol = _("Protocol")
keymap = _("Keymap")
-audio = _("Sound")
+sound = _("Sound")
none = _("None")
username = _("Username:")
password = _("Password:")
@@ -247,13 +247,13 @@
keyboard_hw_help = _("Please specify the keyboard translation map file.")
-audio_hw_help = _("Please specify the sound device.")
-audio_hw_ac97 = _("Intel 82801AA Audio Codec 97")
-audio_hw_es1370 = _("Ensoniq AudioPCI ES1370")
-audio_hw_ich6 = _("Intel I/O Controller Hub 6 (ICH6)")
-audio_hw_sb16 = _("Creative Sound Blaster 16")
-audio_hw_none = _("No Audio Support")
-audio_hw_all = _("All")
+sound_hw_help = _("Please specify the sound device.")
+sound_hw_ac97 = _("Intel 82801AA Audio Codec 97")
+sound_hw_es1370 = _("Ensoniq AudioPCI ES1370")
+sound_hw_ich6 = _("Intel I/O Controller Hub 6 (ICH6)")
+sound_hw_sb16 = _("Creative Sound Blaster 16")
+sound_hw_none = _("No Sound Support")
+sound_hw_all = _("All")
sound_card = _("Sound Card")
# Disks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/options.py
new/vm-install-0.5.4/src/vminstall/options.py
--- old/vm-install-0.5.3/src/vminstall/options.py 2011-05-11
19:20:32.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/options.py 2011-05-23
18:22:11.000000000 +0200
@@ -29,7 +29,7 @@
import cpuid
import paths
import advanced
-import audio
+import sound
on_exit = ["destroy", "restart", "preserve", "rename-restart",
"coredump-destroy", "coredump-restart"]
@@ -48,7 +48,7 @@
'install',
'kernel',
'keymap',
- 'audio', # 'all', 'es1370', sb16, 'ac97, 'ich6'
+ 'sound', # 'all', 'es1370', sb16, 'ac97, 'ich6'
'loader',
'max_memoryMB',
'memoryMB',
@@ -73,12 +73,13 @@
'vnc_password',
'vncport',
'pxe_boot',
+ 'pxe_addr',
+ 'pxe_label',
'direct_kernel_boot',
'non_pae',
'existing_os',
'no_install',
'preserve_on_error',
- 'pxe_label',
'config_dir',
'connect',
'use_libvirt',
@@ -170,8 +171,8 @@
# FIXME, need real string
#raise ParamError(err=ParamError.E_INVALID, details=msg.keymap)
bad()
- elif item == 'audio':
- values = audio.get_audio_cards().keys()
+ elif item == 'sound':
+ values = sound.get_sound_cards().keys()
if value not in values:
bad()
elif item == 'loader':
@@ -245,6 +246,8 @@
elif item == 'pxe_boot':
check_type(value, (int, bool))
value = bool(value)
+ elif item == 'pxe_addr':
+ check_type(value, (str,))
elif item == 'direct_kernel_boot':
check_type(value, (int, bool))
value = bool(value)
@@ -407,6 +410,11 @@
else:
defaults.pxe_boot = False
+ if options.pxe_addr:
+ defaults.pxe_addr = options.pxe_addr
+ else:
+ defaults.pxe_addr = None
+
if options.full_virt:
defaults.full_virt = options.full_virt
else:
@@ -558,10 +566,10 @@
else:
defaults.keymap = None
- if options.audio:
- defaults.audio = options.audio
+ if options.sound:
+ defaults.sound = options.sound
else:
- defaults.audio = vmdefaults.audio()
+ defaults.sound = vmdefaults.sound()
if options.graphics_viewer == 'sdl':
defaults.graphics_viewer = 'sdl'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/sound.py
new/vm-install-0.5.4/src/vminstall/sound.py
--- old/vm-install-0.5.3/src/vminstall/sound.py 1970-01-01 01:00:00.000000000
+0100
+++ new/vm-install-0.5.4/src/vminstall/sound.py 2011-05-23 18:21:52.000000000
+0200
@@ -0,0 +1,72 @@
+# Sound Interface Card
+#
+# Copyright 2011 Novell, Inc.
+# Author:
+#
+# This software may be freely redistributed under the terms of the GNU
+# general public license.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+from exceptions import *
+import msg
+import caps
+
+################################################################################
+# GLOBAL DATA
+################################################################################
+
+#
+# Define a dictionary with the valid sound cards
+#
+xen_sound_cards = {
+ 'none': msg.none,
+ 'all': msg.sound_hw_all,
+ 'ac97': msg.sound_hw_ac97,
+ 'es1370': msg.sound_hw_es1370,
+ 'ich6': msg.sound_hw_ich6,
+ 'sb16': msg.sound_hw_sb16,
+}
+
+kvm_sound_cards = {
+ 'none': msg.none,
+ 'ac97': msg.sound_hw_ac97,
+ 'es1370': msg.sound_hw_es1370,
+ 'ich6': msg.sound_hw_ich6,
+ 'sb16': msg.sound_hw_sb16,
+}
+
+################################################################################
+# GLOBAL FUNCTIONS
+################################################################################
+
+#-------------------------------------------------------------------------------
+# Function: parse_string
+# Parms:
+# card: type of sound card
+#
+# The input string is parsed and validated
+#-------------------------------------------------------------------------------
+def parse_string(card):
+ if card not in sound_cards:
+ raise ParamError(err=ParamError.E_INVALID, details=card)
+ return card
+
+#-------------------------------------------------------------------------------
+# Function: get_sound_cards
+# Parms:
+#
+# The input string is parsed and validated
+#-------------------------------------------------------------------------------
+def get_sound_cards():
+ if caps.is_xen():
+ return xen_sound_cards
+ else:
+ return kvm_sound_cards
+
+def get_sound(current_card=None):
+ if current_card is None:
+ current_card = 'none'
+ return get_sound_cards()[current_card]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/util.py
new/vm-install-0.5.4/src/vminstall/util.py
--- old/vm-install-0.5.3/src/vminstall/util.py 2011-05-07 00:17:47.000000000
+0200
+++ new/vm-install-0.5.4/src/vminstall/util.py 2011-05-20 23:18:18.000000000
+0200
@@ -310,13 +310,20 @@
managed_vms.append(words[0])
return managed_vms
+_xend_running = None
+
def is_xend_running():
+ global _xend_running
+ if _xend_running is not None:
+ return _xend_running
if os.path.exists('/usr/sbin/xend'):
try:
- util.run(['/usr/sbin/xend', 'status'])
+ run(['/usr/sbin/xend', 'status'])
+ _xend_running = True
return True
except:
pass
+ _xend_running = False
return False
def get_config_file_option(config_file, var):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.5.3/src/vminstall/xen_guest.py
new/vm-install-0.5.4/src/vminstall/xen_guest.py
--- old/vm-install-0.5.3/src/vminstall/xen_guest.py 2011-04-28
19:11:23.000000000 +0200
+++ new/vm-install-0.5.4/src/vminstall/xen_guest.py 2011-05-23
18:23:35.000000000 +0200
@@ -230,16 +230,16 @@
ret += "]"
return ret
- def _get_audio_xml(self):
+ def _get_sound_xml(self):
ret = ''
- if self.options.audio and self.options.audio != 'none':
- ret = ["<sound model='%s'/>" % self.options.audio]
+ if self.options.sound and self.options.sound != 'none':
+ ret = ["<sound model='%s'/>" % self.options.sound]
return ret
- def _get_audio_xen(self):
+ def _get_sound_xen(self):
ret = ''
- if self.options.audio and self.options.audio != 'none':
- ret = "soundhw=\"%s\"\n" %(self.options.audio)
+ if self.options.sound and self.options.sound != 'none':
+ ret = "soundhw=\"%s\"\n" %(self.options.sound)
return ret
def _get_keymap_xml(self):
@@ -315,12 +315,13 @@
def PreInstall(self, progress=lambda f:None):
if hypervisor.connection.domain_running(self.options.name):
raise VmError(VmError.E_VM_EXISTS)
- if self.options.direct_kernel_boot:
+ if not self.options.full_virt or self.options.direct_kernel_boot:
if self.options.os_settings:
self.os().actions().setupOsSettings(self, lambda
f:progress(f*0.05))
- self.dkb = DirectKernelBoot(self.options)
- self.dkb._cleanup_kernel() # In case the install was retried
- (self.kernel, self.initrd) =
self.dkb._get_directkernelboot_install_images(lambda f:progress(0.5+f*0.5))
+ if self.options.direct_kernel_boot:
+ self.dkb = DirectKernelBoot(self.options)
+ self.dkb._cleanup_kernel() # In case the install was retried
+ (self.kernel, self.initrd) =
self.dkb._get_directkernelboot_install_images(lambda f:progress(0.5+f*0.5))
self.create_devices(lambda f:progress(0.05 + f*0.95))
def Start(self):
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
