Author: mzugec
Date: Mon Dec 20 11:27:47 2010
New Revision: 63011
URL: http://svn.opensuse.org/viewcvs/yast?rev=63011&view=rev
Log:
fate#306855: FCoE boot support
Modified:
trunk/yast2/VERSION
trunk/yast2/library/network/src/NetworkStorage.ycp
trunk/yast2/package/yast2.changes
Modified: trunk/yast2/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63011&r1=63010&r2=63011&view=diff
==============================================================================
--- trunk/yast2/VERSION (original)
+++ trunk/yast2/VERSION Mon Dec 20 11:27:47 2010
@@ -1 +1 @@
-2.20.5
+2.20.6
Modified: trunk/yast2/library/network/src/NetworkStorage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkStorage.ycp?rev=63011&r1=63010&r2=63011&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkStorage.ycp (original)
+++ trunk/yast2/library/network/src/NetworkStorage.ycp Mon Dec 20 11:27:47 2010
@@ -40,6 +40,21 @@
}
integer network_based=0;
+ // test for multipath
+ if (network_based==0 && issubstring(device, "/dev/dm-")) {
+ y2warning("multipath detected!");
+ string dev_name = splitstring(device, "/")[2]:"";
+ y2milestone("Multipath device name %1", dev_name);
+ map cmd = (map)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name));
+ y2milestone("Show slaves command:%1", cmd);
+ if (cmd["exit"]:-1==0){
+ // FIXME: what about more slaves?
+ list<string> slaves = splitstring(cmd["stdout"]:"", "\n");
+ integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:""));
+ if (nb>0) network_based=nb;
+ } else y2error("Error while executed show slaves commad:%1", cmd["stderr"]:"");
+ }
+
// test for LVM
if (network_based==0 && issubstring(device, "/dev/mapper/")) {
y2warning("LVM detected!");
@@ -84,7 +99,7 @@
}
}
-// test for nfs (bnc#384420)
+ // test for nfs (bnc#384420)
if (network_based==0) {
string space="[[:space:]]";
if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){
@@ -92,6 +107,21 @@
network_based=2;
}
}
+
+ //test for FCoE
+ if (network_based==0){
+ if (issubstring(device, "/dev/")){
+ device = splitstring(device, "/")[2]:"";
+ }
+ string sys=sformat("/sys/class/block/%1", device);
+ if (FileUtils::Exists(sys)){
+ if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q target", sys))==0){
+ y2warning("FCoE detected!");
+ network_based=3;
+ }
+ }
+ }
+
return network_based;
}
Modified: trunk/yast2/package/yast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=63011&r1=63010&r2=63011&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Mon Dec 20 11:27:47 2010
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Dec 20 11:27:17 CET 2010 - mzugec@suse.cz
+
+- fate#306855: FCoE boot support
+- 2.20.6
+
+-------------------------------------------------------------------
Tue Nov 16 15:45:30 CET 2010 - mzugec@suse.cz
- save log file into home directory by default (bnc#653601)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
