Hello community,
here is the log from the commit of package yast2-vm for openSUSE:Factory
checked in at 2014-07-11 20:05:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old)
and /work/SRC/openSUSE:Factory/.yast2-vm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2014-06-26
08:00:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2014-07-11
20:05:25.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 2 17:02:00 MDT 2014 - carn...@suse.com
+
+- Don't create a bridge on SLED as it is not a Virtualization Host.
+- 3.1.14
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-3.1.13.tar.bz2
New:
----
yast2-vm-3.1.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.WZBdNN/_old 2014-07-11 20:05:26.000000000 +0200
+++ /var/tmp/diff_new_pack.WZBdNN/_new 2014-07-11 20:05:26.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-vm
-Version: 3.1.13
+Version: 3.1.14
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-vm-3.1.13.tar.bz2 -> yast2-vm-3.1.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-3.1.13/package/yast2-vm.changes
new/yast2-vm-3.1.14/package/yast2-vm.changes
--- old/yast2-vm-3.1.13/package/yast2-vm.changes 2014-06-18
16:47:50.000000000 +0200
+++ new/yast2-vm-3.1.14/package/yast2-vm.changes 2014-07-03
01:32:23.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jul 2 17:02:00 MDT 2014 - carn...@suse.com
+
+- Don't create a bridge on SLED as it is not a Virtualization Host.
+- 3.1.14
+
+-------------------------------------------------------------------
Wed Jun 18 08:29:15 MDT 2014 - carn...@suse.com
- Include enable and start of libvirtd service for s390x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-3.1.13/package/yast2-vm.spec
new/yast2-vm-3.1.14/package/yast2-vm.spec
--- old/yast2-vm-3.1.13/package/yast2-vm.spec 2014-06-18 16:47:50.000000000
+0200
+++ new/yast2-vm-3.1.14/package/yast2-vm.spec 2014-07-03 01:32:23.000000000
+0200
@@ -17,7 +17,7 @@
Name: yast2-vm
-Version: 3.1.13
+Version: 3.1.14
Release: 0
Group: System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-vm-3.1.13/src/modules/VM_XEN.rb
new/yast2-vm-3.1.14/src/modules/VM_XEN.rb
--- old/yast2-vm-3.1.13/src/modules/VM_XEN.rb 2014-06-18 16:47:50.000000000
+0200
+++ new/yast2-vm-3.1.14/src/modules/VM_XEN.rb 2014-07-03 01:32:23.000000000
+0200
@@ -277,6 +277,9 @@
),
)
elsif isSLED == true
+ progress_stages = [
+ _("Verify Installed Packages")
+ ]
UI.OpenDialog(
HBox(
HSpacing(2),
@@ -463,44 +466,47 @@
end
if is_s390 == false
- # Default Bridge stage
- Progress.NextStage
+ # SLED is not a Virtualization Host so don't create a bridge
+ if isSLED == false
+ # Default Bridge stage
+ Progress.NextStage
- Progress.Title(_("Configuring Default Network Bridge..."))
+ Progress.Title(_("Configuring Default Network Bridge..."))
- # Check for the existance of /sys/class/net/*/bridge
- interfaces = Convert.convert(
- SCR.Read(path(".target.dir"), @net_path),
- :from => "any",
- :to => "list <string>"
- )
- Builtins.foreach(interfaces) do |i|
- Builtins.y2milestone("Checking for bridges...")
- bridge_path = Ops.add(Ops.add(Ops.add(@net_path, "/"), i), "/bridge")
- if Ops.greater_or_equal(SCR.Read(path(".target.dir"), bridge_path),
0)
- Builtins.y2milestone("Dom0 already has a configured bridge.")
- bridge_exists = true
- raise Break
+ # Check for the existance of /sys/class/net/*/bridge
+ interfaces = Convert.convert(
+ SCR.Read(path(".target.dir"), @net_path),
+ :from => "any",
+ :to => "list <string>"
+ )
+ Builtins.foreach(interfaces) do |i|
+ Builtins.y2milestone("Checking for bridges...")
+ bridge_path = Ops.add(Ops.add(Ops.add(@net_path, "/"), i),
"/bridge")
+ if Ops.greater_or_equal(SCR.Read(path(".target.dir"),
bridge_path), 0)
+ Builtins.y2milestone("Dom0 already has a configured bridge.")
+ bridge_exists = true
+ raise Break
+ end
end
- end
- # Popup yes/no dialog
- if bridge_exists == false
- if Popup.AnyQuestionRichText(
- _("Network Bridge."),
- _(
- "<p>For normal network configurations hosting virtual
machines, a network bridge is recommended.</p><p>Configure a default network
bridge?</p>"
- ),
- 45,
- 5,
- Label.YesButton,
- Label.NoButton,
- :focus_yes
- )
- Builtins.y2milestone("Configuring default bridge for Xen or
KVM...")
- Lan.Read(:cache)
- Lan.ProposeVirtualized
- Lan.Write
+ # Popup yes/no dialog
+ if bridge_exists == false
+ if Popup.AnyQuestionRichText(
+ _("Network Bridge."),
+ _(
+ "<p>For normal network configurations hosting virtual
machines, a network bridge is recommended.</p><p>Configure a default network
bridge?</p>"
+ ),
+ 45,
+ 5,
+ Label.YesButton,
+ Label.NoButton,
+ :focus_yes
+ )
+ Builtins.y2milestone("Configuring default bridge for Xen or
KVM...")
+ Lan.Read(:cache)
+ Lan.ProposeVirtualized
+ Lan.Write
+ end
end
end
else
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
