Mailinglist Archive: opensuse-commit (817 mails)
| < Previous | Next > |
commit yast2-multipath
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 03 Dec 2008 16:43:36 +0100
- Message-id: <20081203154337.34571678166@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-multipath
checked in at Wed Dec 3 16:43:36 CET 2008.
--------
--- yast2-multipath/yast2-multipath.changes 2008-11-21 10:44:49.000000000
+0100
+++ /mounts/work_src_done/STABLE/yast2-multipath/yast2-multipath.changes
2008-12-03 08:20:10.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 3 13:48:02 CST 2008 - xwhu@xxxxxxxxxx
+
+- Fix bnc#438055, remove all usage of /etc/init.d/multipath during
+installation, disable Configure tab during installation.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-multipath.spec ++++++
--- /var/tmp/diff_new_pack.Z19422/_old 2008-12-03 16:43:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Z19422/_new 2008-12-03 16:43:26.000000000 +0100
@@ -21,7 +21,7 @@
Name: yast2-multipath
Version: 2.17.1
-Release: 3
+Release: 4
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -93,6 +93,9 @@
%doc %{prefix}/share/doc/packages/yast2-multipath
%changelog
+* Wed Dec 03 2008 xwhu@xxxxxxxxxx
+- Fix bnc#438055, remove all usage of /etc/init.d/multipath during
+ installation, disable Configure tab during installation.
* Fri Nov 21 2008 xwhu@xxxxxxxxxx
- fix bnc#438061, call Storage::ActivateMultipath instead of
/etc/init.d/multipath during installation
- related to bnc#438055, do not insserv during installation cause libstorage
enable the service already.
++++++ use-storage-activatemultipath.diff ++++++
--- /var/tmp/diff_new_pack.Z19422/_old 2008-12-03 16:43:27.000000000 +0100
+++ /var/tmp/diff_new_pack.Z19422/_new 2008-12-03 16:43:27.000000000 +0100
@@ -1,7 +1,7 @@
Index: yast2-multipath-2.17.1/src/complex.ycp
===================================================================
--- yast2-multipath-2.17.1.orig/src/complex.ycp 2008-09-27
14:18:03.000000000 +0800
-+++ yast2-multipath-2.17.1/src/complex.ycp 2008-11-21 17:44:05.000000000
+0800
++++ yast2-multipath-2.17.1/src/complex.ycp 2008-12-03 13:55:41.000000000
+0800
@@ -33,6 +33,7 @@
textdomain "multipath";
@@ -10,7 +10,22 @@
integer service_status = 0;
boolean has_dumbtab = false;
-@@ -2691,37 +2692,61 @@
+@@ -2659,8 +2660,12 @@
+
+
+ void Update_Service_Status() {
+- integer ret = Service::Status("multipathd");
+-// integer ret = (integer) SCR::Execute(.target.bash,
"/etc/init.d/multipathd status");
++ integer ret = 0;
++ if (Mode::normal() && Stage::normal()) {
++ ret = Service::Status("multipathd");
++ } else {
++ ret = (integer)SCR::Execute(.target.bash, "/bin/ps -A -o comm |
grep -q multipathd");
++ }
+ if (ret == 0) {
+ UI::ChangeWidget(`id(`stop_multipath), `Value, false);
+ UI::ChangeWidget(`id(`start_multipath), `Value, true);
+@@ -2691,37 +2696,61 @@
UI::ChangeWidget(`id(`status_summary_id), `Value, info);
}
@@ -98,7 +113,7 @@
service_status = 1;
Update_Service_Status();
}
-@@ -2731,32 +2756,40 @@
+@@ -2731,32 +2760,40 @@
return;
string prop_info = _("Do not use multipath failed:") + "\n";
@@ -167,8 +182,8 @@
}
Index: yast2-multipath-2.17.1/src/Multipath.ycp
===================================================================
---- yast2-multipath-2.17.1.orig/src/Multipath.ycp 2008-11-21
17:43:33.000000000 +0800
-+++ yast2-multipath-2.17.1/src/Multipath.ycp 2008-11-21 17:43:33.000000000
+0800
+--- yast2-multipath-2.17.1.orig/src/Multipath.ycp 2008-12-03
13:55:41.000000000 +0800
++++ yast2-multipath-2.17.1/src/Multipath.ycp 2008-12-03 14:56:56.000000000
+0800
@@ -46,6 +46,7 @@
import "PackageSystem";
import "Mode";
@@ -222,7 +237,26 @@
y2milestone ("Not checking installed packages");
}
-@@ -266,13 +270,19 @@
+@@ -194,9 +198,15 @@
+ sleep(sl);
+
+ /* read multipath service status */
+- service_status = (integer) SCR::Execute(.target.bash,
"/etc/init.d/multipathd status");
+- if(service_status > 0)
+- service_status = 1;
++ if (Mode::normal() && Stage::normal()) {
++ service_status = (integer) SCR::Execute(.target.bash,
"/etc/init.d/multipathd status");
++ if(service_status > 0)
++ service_status = 1;
++ } else {
++ service_status = (integer) SCR::Execute(.target.bash, "/bin/ps
-A -o comm | grep -q multipathd");
++ if (service_status != 0)
++ service_status = 1;
++ }
+ Progress::NextStep();
+ sleep(sl);
+
+@@ -266,13 +276,19 @@
/* restart multipathd */
Progress::NextStage ();
@@ -236,14 +270,40 @@
+ Report::Error(_("Restart multipathd failed."));
+ return false;
+ }
-+ sleep(sl);
+ } else {
+ Storage::ActivateMultipath(false);
+ Storage::ActivateMultipath(true);
+ }
++ sleep(sl);
}
- sleep(sl);
- }
/* Progress finished */
Progress::NextStage();
+@@ -330,6 +346,12 @@
+ symbol current_tab = `status;
+ integer interval_millisec = 50;
+
++ // Disable configure tab during installation
++ if (!(Mode::normal() && Stage::normal())) {
++ if (!has_dumbtab)
++ UI::ChangeWidget(`id(_("Configure")), `Enabled, false);
++ }
++
+ while(true) {
+ ret = UI::TimeoutUserInput(interval_millisec);
+ interval_millisec = 5000;
+@@ -356,6 +378,12 @@
+ current_tab = `status;
+ continue;
+ } else if (ret == _("Configure")) {
++ if (!(Mode::normal() && Stage::normal())) {
++ Popup::Message("Can't change configuration of multipath
during installation");
++ if (has_dumbtab)
++ UI::ChangeWidget(`id(`tabs), `CurrentItem,
_("Status"));
++ continue;
++ }
+ Wizard::SetContentsButtons(caption, contents,
HELPS["Configure_help"]:"",
+ Label::BackButton(),
Label::FinishButton());
+ Wizard::HideBackButton();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |