Author: charlesa
Date: Fri Oct 24 22:16:24 2008
New Revision: 52543
URL: http://svn.opensuse.org/viewcvs/yast?rev=52543&view=rev
Log:
bnc#436987 - More fixes to check for bridges. Add
popup to query user.
Modified:
trunk/vm/src/VM_XEN.ycp
Modified: trunk/vm/src/VM_XEN.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/VM_XEN.ycp?rev=52543&r1=52542&r2=52543&view=diff
==============================================================================
--- trunk/vm/src/VM_XEN.ycp (original)
+++ trunk/vm/src/VM_XEN.ycp Fri Oct 24 22:16:24 2008
@@ -41,8 +41,11 @@
import "Report";
import "SuSEFirewall";
import "Wizard";
+ import "Label";
+ string net_path = "/sys/class/net/";
+
global boolean ConfigureFirewall() {
y2milestone("VM_XEN::ConfigureFirewall() started");
boolean ret = true;
@@ -154,6 +157,9 @@
list progress_descriptions = [];
+ boolean bridge_exists = false;
+ string bridge_path = "";
+
integer progress_length = size(progress_stages);
// Headline for management domain installation
@@ -189,6 +195,8 @@
boolean inst_gui = true;
+ y2milestone("VM_XEN::ConfigureDom0 Checking for packages...");
+
// Assume python gtk is installed. If in text mode we don't care
if (UI::GetDisplayInfo()["TextMode"]:true == true) {
inst_gui = Popup::YesNo (_("Running in text mode. Install graphical components anyway?"));
@@ -219,12 +227,31 @@
Progress::NextStage();
Progress::Title(_("Configuring Default Network Bridge..."));
- {
- y2milestone("Configuring default bridge for Xen...");
- WFM::call("lan_proposal", ["MakeProposal"]);
- UI::OpenDialog(`VBox());
- WFM::call("lan_proposal", ["Write"]);
- UI::CloseDialog();
+
+ // Check for the existance of /sys/class/net/*/bridge
+ list<string> interfaces = (list<string>)SCR::Read(.target.dir, net_path);
+ // foreach (map