Mailinglist Archive: yast-commit (126 mails)

< Previous Next >
[yast-commit] r67614 - in /branches/SuSE-SLE-10-SP4-Branch/s390: VERSION package/yast2-s390.changes src/dasd/dialogs.ycp src/modules/DASDController.ycp yast2-s390.spec.in
Author: aschnell
Date: Mon Mar 12 15:50:03 2012
New Revision: 67614

URL: http://svn.opensuse.org/viewcvs/yast?rev=67614&view=rev
Log:
- fixed DIAG mode setting (bnc#652962)

Modified:
branches/SuSE-SLE-10-SP4-Branch/s390/VERSION
branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes
branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp
branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp
branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in

Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/VERSION?rev=67614&r1=67613&r2=67614&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/s390/VERSION (original)
+++ branches/SuSE-SLE-10-SP4-Branch/s390/VERSION Mon Mar 12 15:50:03 2012
@@ -1 +1 @@
-2.13.28
+2.13.29

Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes?rev=67614&r1=67613&r2=67614&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes (original)
+++ branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes Mon Mar 12
15:50:03 2012
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 12 15:27:55 CET 2012 - aschnell@xxxxxxx
+
+- fixed DIAG mode setting (bnc#652962)
+- 2.13.29
+
+-------------------------------------------------------------------
Fri Oct 8 14:34:06 CEST 2010 - mzugec@xxxxxxx

- require s390-tools only on s390 s390x

Modified: branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp?rev=67614&r1=67613&r2=67614&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp (original)
+++ branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp Mon Mar 12
15:50:03 2012
@@ -401,7 +401,10 @@
}
foreach (integer id, to_activate, ``{
string channel = DASDController::devices[id,"channel"]:"";
+ boolean active = DASDController::devices[id, "resource", "io",
0, "active"]:false;
DASDController::diag[channel] = true;
+ if (active)
+ DASDController::ActivateDisk(channel, true);
});

ReloadDASDDialog ();
@@ -421,7 +424,10 @@
}
foreach (integer id, to_activate, ``{
string channel = DASDController::devices[id,"channel"]:"";
+ boolean active = DASDController::devices[id, "resource", "io",
0, "active"]:false;
DASDController::diag[channel] = false;
+ if (active)
+ DASDController::ActivateDisk(channel, false);
});

ReloadDASDDialog ();

Modified: branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp?rev=67614&r1=67613&r2=67614&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp
(original)
+++ branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp Mon Mar
12 15:50:03 2012
@@ -320,12 +320,13 @@
d["formatted"] = formatted;
d["partition_info"] = GetPartitionInfo (device);
}
- string diag_file = sformat("/sys/%1/use_diag", d["sysfs_id"]:"");
+
+ string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:"");
+ y2milestone("diag_file:%1", diag_file);
if (FileUtils::Exists(diag_file)){
string use_diag = (string)SCR::Read(.target.string, diag_file);
-// y2milestone("use_diag %1", use_diag);
- if (substring(use_diag,0,1) == "1") diag[channel]=true;
- else diag[channel]=false;
+ y2milestone("use_diag:%1", use_diag);
+ diag[channel] = substring(use_diag, 0, 1) == "1";
}
return d;
});

Modified: branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in?rev=67614&r1=67613&r2=67614&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in (original)
+++ branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in Mon Mar 12 15:50:03
2012
@@ -4,7 +4,7 @@
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer
sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite

%ifarch s390 s390x
-Requires: yast2 s390-tools
+Requires: yast2 s390-tools yast2-hardware-detection >= 2.13.8
%endif

Summary: Configuration of s390

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages