Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-09-05 09:34:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vm-install (Old)
and /work/SRC/openSUSE:Factory/.vm-install.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2014-08-13 08:49:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-09-05 09:34:49.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 3 15:32:11 MDT 2014 - carnold@suse.com
+
+- bnc#894948 - vm-install fails when kernel-default is installed
+ on paravirtual guests
+- Updated language files
+- Version 0.8.32
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.8.31.tar.bz2
New:
----
vm-install-0.8.32.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.0aHOf4/_old 2014-09-05 09:34:50.000000000 +0200
+++ /var/tmp/diff_new_pack.0aHOf4/_new 2014-09-05 09:34:50.000000000 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: vm-install
%if %suse_version <= 1230
%define with_vminstall_as_default_installer 1
@@ -27,12 +26,12 @@
%endif
# For directory ownership:
BuildRequires: yast2
-Version: 0.8.31
+Version: 0.8.32
Release: 0
Summary: Tool to Define a Virtual Machine and Install Its Operating System
License: GPL-2.0
Group: System/Emulators/PC
-Source0: %{name}-0.8.31.tar.bz2
+Source0: %{name}-0.8.32.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 s390x ppc64le
++++++ vm-install-0.8.31.tar.bz2 -> vm-install-0.8.32.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.31/Makefile new/vm-install-0.8.32/Makefile
--- old/vm-install-0.8.31/Makefile 2014-08-05 00:47:31.000000000 +0200
+++ new/vm-install-0.8.32/Makefile 2014-09-03 23:29:58.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.8.31
+VER = 0.8.32
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.31/po/ar.po new/vm-install-0.8.32/po/ar.po
--- old/vm-install-0.8.31/po/ar.po 2014-07-18 20:18:00.000000000 +0200
+++ new/vm-install-0.8.32/po/ar.po 2014-09-03 23:32:51.000000000 +0200
@@ -6,7 +6,7 @@
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-05-08 18:43-0600\n"
-"PO-Revision-Date: 2014-07-15 11:31\n"
+"PO-Revision-Date: 2014-09-03 10:42\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
"Language: \n"
@@ -389,7 +389,7 @@
#: src/vminstall/msg.py:146
msgid "SUSE Linux Enterprise Server 10"
-msgstr "SUSE Linux Enterprise Server 10"
+msgstr "SUSE Linux Enterprise Server 10"
#: src/vminstall/msg.py:147
msgid "SUSE Linux Enterprise Server 11"
@@ -401,11 +401,11 @@
#: src/vminstall/msg.py:149
msgid "SUSE Linux Enterprise Server 8"
-msgstr "SUSE Linux Enterprise Server 8"
+msgstr "SUSE Linux Enterprise Server 8"
#: src/vminstall/msg.py:150
msgid "SUSE Linux Enterprise Server 9"
-msgstr "SUSE Linux Enterprise Server 9"
+msgstr "SUSE Linux Enterprise Server 9"
#: src/vminstall/msg.py:151
msgid "Solaris 10"
@@ -698,7 +698,7 @@
#. TRANSLATORS Do not translate %(url)s
#: src/vminstall/msg.py:232
msgid "For the most current information on SUSE VM server technology, see "
-msgstr "للحصول على أحدث المعلومات عن تكنولوجيا ملقم SUSE الظاهري، راجع "
+msgstr "للحصول على أحدث المعلومات عن تكنولوجيا خادم SUSE الظاهري، راجع "
#: src/vminstall/msg.py:233
#, python-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.31/po/ko.po new/vm-install-0.8.32/po/ko.po
--- old/vm-install-0.8.31/po/ko.po 2014-07-18 20:18:03.000000000 +0200
+++ new/vm-install-0.8.32/po/ko.po 2014-09-03 23:32:56.000000000 +0200
@@ -6,7 +6,7 @@
"Project-Id-Version: xen-vm-install\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-05-08 18:43-0600\n"
-"PO-Revision-Date: 2014-07-15 11:32\n"
+"PO-Revision-Date: 2014-09-03 10:43\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
"Language: \n"
@@ -393,7 +393,7 @@
#: src/vminstall/msg.py:147
msgid "SUSE Linux Enterprise Server 11"
-msgstr "SUSE Linux Enterprise Desktop 11"
+msgstr "SUSE Linux Enterprise Server 11"
#: src/vminstall/msg.py:148
msgid "SUSE Linux Enterprise Server 12"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.31/setup.py new/vm-install-0.8.32/setup.py
--- old/vm-install-0.8.31/setup.py 2014-08-05 00:47:28.000000000 +0200
+++ new/vm-install-0.8.32/setup.py 2014-09-03 23:29:54.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.8.31',
+ version='0.8.32',
description='Define a virtual machine and install its operating system',
author='Charles Coffing',
author_email='ccoffing@novell.com',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.31/src/vminstall/ParaVirtGuest.py new/vm-install-0.8.32/src/vminstall/ParaVirtGuest.py
--- old/vm-install-0.8.31/src/vminstall/ParaVirtGuest.py 2014-08-04 16:19:13.000000000 +0200
+++ new/vm-install-0.8.32/src/vminstall/ParaVirtGuest.py 2014-09-03 23:08:19.000000000 +0200
@@ -165,7 +165,9 @@
loader_line = util.run(['/bin/grep', '^LOADER_TYPE', bootloader])
if loader_line and 'grub2' in loader_line and os.path.exists(path + 'grub2/grub.cfg'):
g = grub.GrubConf.Grub2ConfigFile(path + 'grub2/grub.cfg')
- menu_file = path + 'etc/default/grub'
+ if path.endswith('boot/'):
+ path = path.rstrip('boot/')
+ menu_file = path + '/etc/default/grub'
menu_file_field = 'GRUB_DEFAULT'
elif os.path.exists(path + 'grub/menu.lst'):
g = grub.GrubConf.GrubConfigFile(path + 'grub/menu.lst')
@@ -179,12 +181,12 @@
if g:
default = g._get_default()
img = g.images[default]
- if img and 'xen' not in img.kernel[1]:
+ if img and not img.kernel or 'xen' not in img.kernel[1]:
new_default = 0
for img in g.images:
- if 'xen' in img.kernel[1]:
+ if img.kernel and 'xen' in img.kernel[1]:
sed_cmd = "/bin/sed --in-place 's/^%s %s/%s %s/g' %s" % (menu_file_field, default, menu_file_field, new_default, menu_file)
- log.debug("Setting menu.lst to default to the xen kernel with command: '%s'" % sed_cmd)
+ log.debug("Setting '%s' to default to the xen kernel with command: '%s'" % (menu_file, sed_cmd))
os.system(sed_cmd)
break
new_default = new_default + 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org