May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64121 - /tags/branch-Code-11-SP2-2_17_103/storage/
by fehr＠svn2.opensuse.org 26 May '11

26 May '11

Author: fehr Date: Thu May 26 16:26:45 2011 New Revision: 64121 URL: http://svn.opensuse.org/viewcvs/yast?rev=64121&view=rev Log: Created tag branch-Code-11-SP2-2_17_103 for storage Added: tags/branch-Code-11-SP2-2_17_103/storage/ (props changed) - copied from r64120, branches/SuSE-Code-11-SP2-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64120 - /tags/branch-Code-11-SP2-2_17_103/
by fehr＠svn2.opensuse.org 26 May '11

26 May '11

Author: fehr Date: Thu May 26 16:26:44 2011 New Revision: 64120 URL: http://svn.opensuse.org/viewcvs/yast?rev=64120&view=rev Log: Created tag branch-Code-11-SP2-2_17_103 Added: tags/branch-Code-11-SP2-2_17_103/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64119 - /trunk/storage/storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 26 May '11

26 May '11

Author: fehr Date: Thu May 26 16:20:50 2011 New Revision: 64119 URL: http://svn.opensuse.org/viewcvs/yast?rev=64119&view=rev Log: fix typo Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu May 26 16:20:50 2011 @@ -1807,12 +1807,12 @@ list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" )); foreach( string k, keys, { tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); }); - y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" )); }); } return( tg ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64118 - /branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 26 May '11

26 May '11

Author: fehr Date: Thu May 26 16:19:04 2011 New Revision: 64118 URL: http://svn.opensuse.org/viewcvs/yast?rev=64118&view=rev Log: fix typo Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Thu May 26 16:19:04 2011 @@ -1807,12 +1807,12 @@ list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" )); foreach( string k, keys, { tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); }); - y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" )); }); } return( tg ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64117 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 26 May '11

26 May '11

Author: fehr Date: Thu May 26 16:15:30 2011 New Revision: 64117 URL: http://svn.opensuse.org/viewcvs/yast?rev=64117&view=rev Log: - remove unsupported state of btrfs - btrfs related bugfixes Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu May 26 16:15:30 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 26 16:07:46 CEST 2011 - fehr(a)suse.de + +- remove unsupported state of btrfs +- btrfs related bugfixes + +------------------------------------------------------------------- Tue Apr 26 17:09:33 CEST 2011 - fehr(a)suse.de - allow autoyast to set disklabel to e.g. gpt (bnc#631176) Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Thu May 26 16:15:30 2011 @@ -182,7 +182,7 @@ `lvm : true ]; - list<symbol> unsupportFs = [ `jfs, `btrfs ]; + list<symbol> unsupportFs = [ `jfs ]; global define list<map<symbol, any> > GetGeneralFstabOptions() Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu May 26 16:15:30 2011 @@ -1803,11 +1803,16 @@ tg["/dev/btrfs","partitions"] = filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); - y2milestone( "simple %1", simple ); + y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); + list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - tg = SetPartitionData( tg, p["device"]:"", "subvol", p["subvol"]:[] ); - tg = SetPartitionData( tg, p["device"]:"", "uuid", p["uuid"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" ); + foreach( string k, keys, + { + tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); + }); + y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" ); }); } return( tg ); @@ -1876,7 +1881,7 @@ conts = getContainers(); map c = $[]; c = find( map c, conts, ``(c["device"]:""==dev) ); - map tg = StorageMap[targets_key]:$[]; + map<string,map> tg = StorageMap[targets_key]:$[]; //SCR::Write(.target.ycp, "/tmp/upd_disk_bef_"+sformat("%1",count), StorageMap[targets_key]:$[] ); if( c==nil ) { @@ -1890,6 +1895,8 @@ else { tg[dev] = getContainerInfo(c); + if( dev=="/dev/btrfs" ) + tg = HandleBtrfsSimpleVolumes( tg ); } StorageMap[targets_key] = tg; //SCR::Write(.target.ycp, "/tmp/upd_disk_aft_"+sformat("%1",count), StorageMap[targets_key]:$[] ); @@ -1902,6 +1909,8 @@ map<string,map> tg = StorageMap[targets_key]:$[]; //SCR::Write(.target.ycp, "/tmp/upd_dev_bef_"+sformat("%1",count), tg ); string cdev=""; + map mdev = GetPartition( tg, dev ); + y2milestone( "UpdateTargetMapDev mdev %1", mdev ); foreach( string key, map d, tg, ``{ if( size(cdev)==0 && @@ -1940,6 +1949,11 @@ } else y2error( "UpdateTargetMapDev key %1 not found in target", disk["device"]:"" ); + if( mdev["used_fs"]:`unknown == `btrfs ) + { + tg["/dev/btrfs"] = getContainerInfo(tg["/dev/btrfs"]:$[]); + tg = HandleBtrfsSimpleVolumes( tg ); + } StorageMap[targets_key] = tg; //SCR::Write(.target.ycp, "/tmp/upd_dev_aft_"+sformat("%1",count), StorageMap[targets_key]:$[] ); //count = count+1; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64116 - in /branches/SuSE-Code-11-SP2-Branch/storage: ./ libstorage/src/ package/ storage/src/modules/
by fehr＠svn2.opensuse.org 26 May '11

26 May '11

Author: fehr Date: Thu May 26 16:08:44 2011 New Revision: 64116 URL: http://svn.opensuse.org/viewcvs/yast?rev=64116&view=rev Log: - remove unsupported state of btrfs - more btrfs related bugfixes - version 2.17.103 Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Thu May 26 16:08:44 2011 @@ -1 +1 @@ -2.17.102 +2.17.103 Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc Thu May 26 16:08:44 2011 @@ -536,6 +536,53 @@ return( txt ); } +Text Btrfs::formatText(bool doing) const + { + Text txt; + bool done = false; + if( devices.size()+dev_add.size()==1 ) + { + Volume const *v = NULL; + if( getStorage()->findVolume( devices.front(), v, true )) + { + y2mil( "found:" << *v ); + txt = v->formatText(doing); + done = true; + } + } + if( !done ) + { + list<string> tl = devices; + tl.insert( tl.end(), dev_add.begin(), dev_add.end() ); + string d = boost::join( tl, " " ); + if( doing ) + { + // displayed text during action, + // %1$s is replaced by size (e.g. 623.5 MB) + // %2$s is repleace by a list of names e.g /dev/sda1 /dev/sda2 + txt = sformat( _("Formatting Btrfs volume of size %1$s (used devices:%2$s)"), + sizeString().c_str(), d.c_str() ); + } + else + { + if( !mp.empty() ) + // displayed text before action, + // %1$s is replaced by size (e.g. 623.5 MB) + // %2$s is repleace by a list of names e.g /dev/sda1 /dev/sda2 + // %3$s is replaced by mount point (e.g. /usr) + txt = sformat( _("Format Btrfs volume of size %1$s for %3$s (used devices:%2$s)"), + sizeString().c_str(), d.c_str(), mp.c_str() ); + else + // displayed text before action, + // %1$s is replaced by size (e.g. 623.5 MB) + // %2$s is repleace by a list of names e.g /dev/sda1 /dev/sda2 + txt = sformat( _("Format Btrfs volume of size %1$s (used devices:%2$s)"), + sizeString().c_str(), d.c_str() ); + } + } + return( txt ); + } + void Btrfs::getCommitActions(list<commitAction>& l) const { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.h Thu May 26 16:08:44 2011 @@ -65,6 +65,7 @@ Text extendText(bool doing, const string& device) const; Text reduceText(bool doing, const string& device) const; Text removeText( bool doing ) const; + Text formatText( bool doing ) const; void countSubvolAddDel( unsigned& add, unsigned& rem ) const; list<string> getSubvolAddDel( bool ) const; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc Thu May 26 16:08:44 2011 @@ -305,20 +305,28 @@ int BtrfsCo::commitChanges( CommitStage stage, Volume* vol ) { y2mil("name:" << name() << " stage:" << stage); - int ret = Container::commitChanges( stage, vol ); - if( ret==0 && stage==DECREASE ) + int ret = 0; + if( stage==DECREASE ) { Btrfs * b = dynamic_cast<Btrfs *>(vol); if( b!=NULL ) - ret = b->doReduce(); + { + if( Btrfs::needReduce(*b) ) + ret = b->doReduce(); + } else ret = BTRFS_COMMIT_INVALID_VOLUME; } - else if( ret==0 && stage==INCREASE ) + if( ret==0 ) + ret = Container::commitChanges( stage, vol ); + if( ret==0 && stage==INCREASE ) { Btrfs * b = dynamic_cast<Btrfs *>(vol); if( b!=NULL ) - ret = b->doExtend(); + { + if( Btrfs::needExtend(*b) ) + ret = b->doExtend(); + } else ret = BTRFS_COMMIT_INVALID_VOLUME; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Thu May 26 16:08:44 2011 @@ -3145,7 +3145,7 @@ { ret = STORAGE_CHANGE_READONLY; } - else if( findVolume( device, cont, vol, false ) ) + else if( findVolume( device, cont, vol, true ) ) { if( canRemove( *vol ) ) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Thu May 26 16:08:44 2011 @@ -1089,7 +1089,7 @@ int ret = -1; if( fs!=TMPFS ) { - int ret = cmd.execute( cmdline ); + ret = cmd.execute( cmdline ); if( ret != 0 && mountDevice()!=dev ) { cmdline = ((detected_fs != SWAP)?UMOUNTBIN " ":SWAPOFFBIN " ") + quote(dev); Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu May 26 16:08:44 2011 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- -Thu May 26 13:59:15 CEST 2011 - fehr(a)suse.de +Thu May 26 16:07:46 CEST 2011 - fehr(a)suse.de - backport patch to support also parted 2.4 +- remove unsupported state of btrfs +- more btrfs related bugfixes +- version 2.17.103 ------------------------------------------------------------------- Tue May 24 11:24:24 CEST 2011 - fehr(a)suse.de Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp Thu May 26 16:08:44 2011 @@ -182,7 +182,7 @@ `lvm : true ]; - list<symbol> unsupportFs = [ `jfs, `btrfs ]; + list<symbol> unsupportFs = [ `jfs ]; global define list<map<symbol, any> > GetGeneralFstabOptions() Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Thu May 26 16:08:44 2011 @@ -1803,11 +1803,16 @@ tg["/dev/btrfs","partitions"] = filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); - y2milestone( "simple %1", simple ); + y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); + list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - tg = SetPartitionData( tg, p["device"]:"", "subvol", p["subvol"]:[] ); - tg = SetPartitionData( tg, p["device"]:"", "uuid", p["uuid"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" ); + foreach( string k, keys, + { + tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); + }); + y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" ); }); } return( tg ); @@ -1876,7 +1881,7 @@ conts = getContainers(); map c = $[]; c = find( map c, conts, ``(c["device"]:""==dev) ); - map tg = StorageMap[targets_key]:$[]; + map<string,map> tg = StorageMap[targets_key]:$[]; //SCR::Write(.target.ycp, "/tmp/upd_disk_bef_"+sformat("%1",count), StorageMap[targets_key]:$[] ); if( c==nil ) { @@ -1890,6 +1895,8 @@ else { tg[dev] = getContainerInfo(c); + if( dev=="/dev/btrfs" ) + tg = HandleBtrfsSimpleVolumes( tg ); } StorageMap[targets_key] = tg; //SCR::Write(.target.ycp, "/tmp/upd_disk_aft_"+sformat("%1",count), StorageMap[targets_key]:$[] ); @@ -1902,6 +1909,8 @@ map<string,map> tg = StorageMap[targets_key]:$[]; //SCR::Write(.target.ycp, "/tmp/upd_dev_bef_"+sformat("%1",count), tg ); string cdev=""; + map mdev = GetPartition( tg, dev ); + y2milestone( "UpdateTargetMapDev mdev %1", mdev ); foreach( string key, map d, tg, ``{ if( size(cdev)==0 && @@ -1940,6 +1949,11 @@ } else y2error( "UpdateTargetMapDev key %1 not found in target", disk["device"]:"" ); + if( mdev["used_fs"]:`unknown == `btrfs ) + { + tg["/dev/btrfs"] = getContainerInfo(tg["/dev/btrfs"]:$[]); + tg = HandleBtrfsSimpleVolumes( tg ); + } StorageMap[targets_key] = tg; //SCR::Write(.target.ycp, "/tmp/upd_dev_aft_"+sformat("%1",count), StorageMap[targets_key]:$[] ); //count = count+1; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64115 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 26 May '11

26 May '11

Author: gs Date: Thu May 26 14:23:50 2011 New Revision: 64115 URL: http://svn.opensuse.org/viewcvs/yast?rev=64115&view=rev Log: exchange order of values in interface table (DCB capable is last) Diese und die folgenden Zeilen werden ignoriert -- M src/complex.ycp M src/FcoeClient.ycp M src/dialogs.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/dialogs.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Thu May 26 14:23:50 2011 @@ -487,7 +487,7 @@ } // -// dev_name device fcoe_vlan dcb_capable fcoe_enable dcb_required vlan_interface modified cfg_file +// dev_name device fcoe_vlan fcoe_enable dcb_required dcb_capable vlan_interface modified cfg_file // eth3 Ethernet card ... eth3.200 yes/no yes/no yes/no 200 yes/no /etc/fcoe/cfg-eth3.200 // // Detect network interface cards (hardware probe) and get status @@ -513,8 +513,9 @@ if ( vlan_interface == "" ) { // FCoE isn't enabled on the switch - we can't do anything here - // TODO - check link map from .probe.network - // and distinguish between no cable attached and interface not up + // TODO - check link map from .probe.network and distinguish between + // no cable attached and interface not up, Steffen: cannot be used, "no" + // can stand for 'noe cable' or 'not up' fcoe_vlan_interface = NOT_AVAILABLE; } else @@ -536,9 +537,9 @@ info_map = add( info_map, "dev_name", card["dev_name"]:""); // network card, e.g. eth3 info_map = add( info_map, "device", card["device"]:""); // description info_map = add( info_map, "fcoe_vlan", fcoe_vlan_interface ); // FCoE VLAN interface, e.g. eth3.200 - info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable info_map = add( info_map, "fcoe_enable", status_map["FCOE_ENABLE"]:""); // FCOE_ENABLE info_map = add( info_map, "dcb_required", status_map["DCB_REQUIRED"]:""); // DCB_REQUIRED + info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable info_map = add( info_map, "vlan_interface", vlan_interface ); // VLAN interface, e.g. 200 info_map = add( info_map, "modified", status_map["Created"]:"no" ); // data not modified info_map = add( info_map, "cfg_file", status_map["Filename"]:"" ); // cfg file name, e.g. /etc/fcoe/cfg-eth3.200 Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Thu May 26 14:23:50 2011 @@ -171,7 +171,7 @@ foreach ( map card, (list<map>)netcards, { table_items = add( table_items, `item(`id(row), card["dev_name"]:"", card["device"]:"", card["fcoe_vlan"]:"", - card["dcb_capable"]:"", card["fcoe_enable"]:"", card["dcb_required"]:"" ) + card["fcoe_enable"]:"", card["dcb_required"]:"", card["dcb_capable"]:"" ) ); row = row + 1; }); @@ -363,8 +363,8 @@ // replace values in table UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["FCOE_ENABLE"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), status_map["DCB_REQUIRED"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), status_map["FCOE_ENABLE"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["DCB_REQUIRED"]:"" ); AdjustButtons(); } Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Thu May 26 14:23:50 2011 @@ -119,8 +119,8 @@ return `MarginBox( mbox_x, mbox_y, `VBox( `Table(`id(`interfaces), `opt(`notify, `immediate, `keepSorting ), - `header(_("Device Name"), _("Model"), _("FCoE VLAN Interface"), _("DCB capable"), - _("FCoE Enable"), _("DCB Required")), + `header(_("Device Name"), _("Model"), _("FCoE VLAN Interface"), + _("FCoE Enable"), _("DCB Required"), _("DCB capable") ), [] ), `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings") ), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64114 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Parted.cc package/yast2-storage.changes
by fehr＠svn2.opensuse.org 26 May '11

26 May '11

Author: fehr Date: Thu May 26 14:00:40 2011 New Revision: 64114 URL: http://svn.opensuse.org/viewcvs/yast?rev=64114&view=rev Log: backport patch to support also parted 2.4 Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc Thu May 26 14:00:40 2011 @@ -41,7 +41,11 @@ SystemCmd cmd(PARTEDCMD + quote(device) + " unit cyl print unit s print"); if (cmd.select("Partition Table:") > 0) + { label = extractNthWord(2, cmd.getLine(0, true)); + if (label == "unknown") + label.clear(); + } else y2war("could not find partition table"); Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu May 26 14:00:40 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 26 13:59:15 CEST 2011 - fehr(a)suse.de + +- backport patch to support also parted 2.4 + +------------------------------------------------------------------- Tue May 24 11:24:24 CEST 2011 - fehr(a)suse.de - add dummy module inst_do_resize again since it is referenced -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64113 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp
by gs＠svn2.opensuse.org 26 May '11

26 May '11

Author: gs Date: Thu May 26 12:59:39 2011 New Revision: 64113 URL: http://svn.opensuse.org/viewcvs/yast?rev=64113&view=rev Log: installed system: start FcoE only 'fipvlan -s <interface> Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Thu May 26 12:59:39 2011 @@ -272,8 +272,11 @@ y2milestone( "Output: %1", output ); // read stdout (remove \n and white spaces) vlan_device_name = deletechars( output["stdout"]:"", " \n\t" ); - - y2milestone( "Returning: %1", vlan_device_name ); + + if ( vlan_device_name != "" ) + { + y2milestone( "Returning: %1", vlan_device_name ); + } return vlan_device_name; } Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Thu May 26 12:59:39 2011 @@ -37,6 +37,7 @@ import "Confirm"; import "FcoeClient"; import "Service"; +import "Stage"; include "fcoe-client/helps.ycp"; @@ -232,93 +233,142 @@ symbol HandleInterfacesDialog( string id, map event ) { - any action = event["ID"]:nil; - - y2milestone( "Event: %1", event ); + any action = event["ID"]:nil; + + y2milestone( "Event: %1", event ); - if ( action == `edit ) - { - y2milestone( "Action: %1, returning %1", action); - return `edit; - } - else if ( action == `interfaces ) - { - FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); - AdjustButtons(); - } - else if ( action == `create ) - { - map card = FcoeClient::GetCurrentNetworkCard(); - string dev_name = card["dev_name"]:""; - boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), - sformat( _("Do you really want to create a FCoE network + if ( action == `edit ) + { + y2milestone( "Action: %1, returning %1", action); + return `edit; + } + else if ( action == `interfaces ) + { + FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); + AdjustButtons(); + } + else if ( action == `create ) + { + map card = FcoeClient::GetCurrentNetworkCard(); + string dev_name = card["dev_name"]:""; + string command = ""; + map output = $[]; + string vlan_interface = ""; + string fcoe_vlan_interface = ""; + map status_map = $[]; + + if ( Stage::initial() ) // first stage - create and start FCoE VLAN interface + { + boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), + sformat( _("Do you really want to create a FCoE network interface for discovered FCoE VLAN interface on %1 and start the FCoE initiator?"), dev_name ) ); - if ( ret == true ) - { - string vlan_interface = ""; - string fcoe_vlan_interface = ""; - map status_map = $[]; - // create and start FCoE with 'fipvlan -c -s eth3' - // revert this (in case of 'Abort') with 'vconfig rem eth3.200' - string command = sformat( "fipvlan -c -s %1", dev_name ); - y2milestone( "Executing command: %1", command ); - map output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); - - if ( output["exit"]:255 == 0 ) - { - // Get new status and exchange list (table) entry - vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); - if ( vlan_interface == "" ) - { - fcoe_vlan_interface = FcoeClient::NOT_AVAILABLE; - } - else - { - fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); - - if ( fcoe_vlan_interface != "" ) - status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - else - fcoe_vlan_interface = FcoeClient::NOT_CONFIGURED; - } - y2milestone( "FCoE VLAN interface: %1", fcoe_vlan_interface ); - // set new value in global map network_interfaces - card["fcoe_vlan"] = fcoe_vlan_interface; - card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; - card["dcb_required"] = status_map["DCB_REQUIRED"]:""; - card["cfg_file"] = status_map["Filename"]:""; - card["modified"] = "yes"; - FcoeClient::SetModified( true ); - - FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); - y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + if ( ret == true ) + { + // create and start FCoE e.g. with 'fipvlan -c -s eth3' + // revert this (in case of 'Abort') with 'vconfig rem eth3.200' + command = sformat( "fipvlan -c -s %1", dev_name ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + + if ( output["exit"]:255 != 0 ) + { + Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); + return nil; + } + } + else + { + y2milestone( "Creating FCoE VLAN interface canceled" ); + return nil; + } + } + else // installed system - if VLAN already exists only start FCoE + { + boolean ret = Popup::YesNoHeadline( _("Starting FCoE on detected VLAN device"), + sformat( _("Do you really want to start FCoE initiator +on discovered FCoE VLAN interface on %1?"), dev_name ) ); + if ( ret == true ) + { + // call 'ifup' for vlan interface - creates /proc/net/vlan/<vlan-interface> + // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists + command = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + + if ( output["exit"]:255 == 0 ) + { + // start FCoE + command = sformat( "fipvlan -s %1", dev_name ); + } + else + { + // create and start FCoE + command = sformat( "fipvlan -c -s %1", dev_name ); + } + + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + if ( output["exit"]:255 != 0 ) + { + Popup::Error( sformat( _("Command \"%1\" on %2 failed."), command, dev_name ) ); + return nil; + } + } + else + { + y2milestone( "Starting FCoE canceled" ); + return nil; + } + } - // replace value in table - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["FCOE_ENABLE"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), status_map["DCB_REQUIRED"]:"" ); - AdjustButtons(); - if ( fcoe_vlan_interface != "" ) - { - // store command to be able to redo the creation of FCoE VLAN interface - // in case of abort - FcoeClient::AddRedoCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); - } - } - else - { - Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); - } - } - else - { - y2milestone( "Creating VLAN interface canceled" ); - } - } + // Get new status and exchange list (table) entry + vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); + if ( vlan_interface == "" ) + { + fcoe_vlan_interface = FcoeClient::NOT_AVAILABLE; + } + else + { + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); - return nil; + if ( fcoe_vlan_interface != "" ) + { + y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); + status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); + + // store command to be able to redo the creation of FCoE VLAN interface + // in case of abort - TODO: is this also OK if only 'fipvlan -s <interface>' is called? + FcoeClient::AddRedoCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); + card["modified"] = "yes"; + FcoeClient::SetModified( true ); + } + else + { + fcoe_vlan_interface = FcoeClient::NOT_CONFIGURED; + } + } + + // set new values in global map network_interfaces + card["fcoe_vlan"] = fcoe_vlan_interface; + card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; + card["dcb_required"] = status_map["DCB_REQUIRED"]:""; + card["cfg_file"] = status_map["Filename"]:""; + + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + + // replace values in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["FCOE_ENABLE"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), status_map["DCB_REQUIRED"]:"" ); + AdjustButtons(); + } + + return nil; } symbol HandleConfigurationDialog( string id, map event ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64112 - /tags/stable-2_21_1/storage/
by aschnell＠svn2.opensuse.org 26 May '11

26 May '11

Author: aschnell Date: Thu May 26 12:01:45 2011 New Revision: 64112 URL: http://svn.opensuse.org/viewcvs/yast?rev=64112&view=rev Log: Created tag stable-2_21_1 for storage Added: tags/stable-2_21_1/storage/ (props changed) - copied from r64111, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0