Author: jreidinger Date: Thu Jan 26 16:19:46 2012 New Revision: 67313 URL: http://svn.opensuse.org/viewcvs/yast?rev=67313&view=rev Log: move test routine for required persistent MAC for s390 devices (way to fix bnc#728611) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp?rev=67313&r1=67312&r2=67313&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp Thu Jan 26 16:19:46 2012 @@ -63,35 +63,6 @@ return (ret == nil)? s: ret; } -string dev_name_to_sysfs_id(string dev_name) { - // hardware is global, read at client start - map hw_item = find(map i, hardware, ``( i["dev_name"]:"" == dev_name )); - return hw_item["sysfs_id"]:""; -} - -string sysfs_card_type(string device) { - string sysfs_id = dev_name_to_sysfs_id(device); - if (sysfs_id == "") return "none"; - string filename = "/sys" + sysfs_id + "/card_type"; - string card_type = (string) SCR::Read(.target.string, filename); - return String::FirstChunk(card_type, "\n"); -} - -boolean s390_device_needs_persistent_mac(string device) { - string card_type = sysfs_card_type(device); - list<string> types_needing_persistent = [ - "OSD_100", - "OSD_1000", - "OSD_10GIG", - "OSD_FE_LANE", - "OSD_GbE_LANE", - "OSD_Express", - ]; - boolean needs_persistent = contains(types_needing_persistent, card_type); - y2milestone("Device: %1, card type: %2, needs persistent MAC: %3", device, card_type, needs_persistent); - return needs_persistent; -} - /** * Read install.inf from the correct location * @return true on success Modified: branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp?rev=67313&r1=67312&r2=67313&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Thu Jan 26 16:19:46 2012 @@ -354,6 +354,36 @@ return need; } +string dev_name_to_sysfs_id(string dev_name) { + // hardware is global, read at client start + map hw_item = find(map i, hardware, ``( i["dev_name"]:"" == dev_name )); + return hw_item["sysfs_id"]:""; +} + +string sysfs_card_type(string device) { + string sysfs_id = dev_name_to_sysfs_id(device); + if (sysfs_id == "") return "none"; + string filename = "/sys" + sysfs_id + "/card_type"; + string card_type = (string) SCR::Read(.target.string, filename); + return String::FirstChunk(card_type, "\n"); +} + +boolean s390_device_needs_persistent_mac(string device) { + string card_type = sysfs_card_type(device); + list<string> types_needing_persistent = [ + "OSD_100", + "OSD_1000", + "OSD_10GIG", + "OSD_FE_LANE", + "OSD_GbE_LANE", + "OSD_Express", + ]; + boolean needs_persistent = contains(types_needing_persistent, card_type); + y2milestone("Device: %1, card type: %2, needs persistent MAC: %3", device, card_type, needs_persistent); + return needs_persistent; +} + + /* map getcfg(string options, string device){ map cfg=$[]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org