February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55345 - /trunk/ncurses/package/yast2-ncurses.changes
by gs＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: gs Date: Mon Feb 9 13:11:39 2009 New Revision: 55345 URL: http://svn.opensuse.org/viewcvs/yast?rev=55345&view=rev Log: Internal changes in NCFileSelection Modified: trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Mon Feb 9 13:11:39 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 9 13:09:12 CET 2009 - gs(a)suse.de + +- Internal changes in NCFileSelection: correct references to + YTableItems and YTableCells + +------------------------------------------------------------------- Mon Feb 9 11:53:36 CET 2009 - sh(a)suse.de - Require latest libyui in spec file (API change) -- 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] r55344 - in /trunk/reipl: package/yast2-reipl.changes src/Reipl.ycp src/inst_reiplauto.ycp src/reipl_bootloader_finish.ycp src/reipl_finish.ycp
by jsrain＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: jsrain Date: Mon Feb 9 13:10:57 2009 New Revision: 55344 URL: http://svn.opensuse.org/viewcvs/yast?rev=55344&view=rev Log: Final fix for reboot (bnc#471522) Modified: trunk/reipl/package/yast2-reipl.changes trunk/reipl/src/Reipl.ycp trunk/reipl/src/inst_reiplauto.ycp trunk/reipl/src/reipl_bootloader_finish.ycp trunk/reipl/src/reipl_finish.ycp Modified: trunk/reipl/package/yast2-reipl.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/package/yast2-reipl.change… ============================================================================== --- trunk/reipl/package/yast2-reipl.changes (original) +++ trunk/reipl/package/yast2-reipl.changes Mon Feb 9 13:10:57 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 9 09:38:05 CET 2009 - hare(a)suse.de + +- Final fix for reboot (bnc#471522) + +------------------------------------------------------------------- Fri Feb 6 11:28:36 CET 2009 - jsrain(a)suse.cz - fixed rebooting (bnc #471522) Modified: trunk/reipl/src/Reipl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/src/Reipl.ycp?rev=55344&r1… ============================================================================== --- trunk/reipl/src/Reipl.ycp (original) +++ trunk/reipl/src/Reipl.ycp Mon Feb 9 13:10:57 2009 @@ -137,7 +137,8 @@ // "method": "ccw", // "ccw": $[ // "device": "0.0.4711", -// "loadparm": "" +// "loadparm": "", +// "parm": "" /* SLES 11 and z/VM only */ // ], // "fcp": $[ // "device": "0.0.4711", @@ -184,6 +185,7 @@ y2error ("Missing loadparm under %1", ccw_directory); return false; } + // don't check for "parm" since it might not be there under zLPAR } if (fcp_exists) { @@ -363,12 +365,13 @@ } /** - * Modifys the reipl configuration passed in with what it should be for the detected + * Returns the reipl configuration passed in with what it should be for the detected * boot partition. - * @param configuration the current configuration. - * @return a map of the new configuration. + * @param configuration an old configuration. + * @return a map of the new target configuration. */ global map <string, any> ModifyReiplWithBootPartition (map <string, any> configuration) { + // get target information list<string> uParts = FindBootPartition (); if (uParts == nil) { @@ -380,12 +383,7 @@ if (size (uParts) == 2) { if (uParts[0]:"" == "ccw") { - if (ccw_exists) { fCCW = true; - } - else { - y2error ("ModifyReiplWithBootPartition: udevPath uses ccw but ccw is not implemented!"); - } } else { y2error ("ModifyReiplWithBootPartition: size of uParts is 2, but first word is not ccw!"); @@ -393,12 +391,7 @@ } else if (size (uParts) == 4) { if (uParts[0]:"" == "zfcp") { - if (fcp_exists) { fFCP = true; - } - else { - y2error ("ModifyReiplWithBootPartition: udevPath uses fcp but fcp is not implemented!"); - } } else { y2error ("ModifyReiplWithBootPartition: size of uParts is 4, but format is not what we expect"); @@ -409,44 +402,29 @@ } if (fCCW) { - configuration["method"] = "ccw"; + configuration["method"] = "ccw"; map ccw_map = (map)configuration["ccw"]:nil; - if (ccw_map == nil) { - y2error ("ModifyReiplWithBootPartition: ccw does not exist in configuration"); - - configuration = nil; - } - else { - ccw_map["device"] = uParts[1]:""; - ccw_map["loadparm"] = ""; - - configuration["ccw"] = ccw_map; - } + ccw_map["device"] = uParts[1]:""; + ccw_map["loadparm"] = ""; + //ccw_map["parm"] = ""; /* SLES 11 and z/VM only */ // read only + configuration["ccw"] = ccw_map; + y2milestone ("ModifyReiplWithBootPartition: modified ccw map"); } else if (fFCP) { configuration["method"] = "fcp"; map fcp_map = (map)configuration["fcp"]:nil; - if (fcp_map == nil) { - y2error ("ModifyReiplWithBootPartition: ccw does not exist in configuration"); - - configuration = nil; - } - else { - fcp_map["device"] = uParts[1]:""; - fcp_map["wwpn"] = uParts[2]:""; - fcp_map["lun"] = uParts[3]:""; - fcp_map["bootprog"] = ""; - fcp_map["br_lba"] = ""; - - configuration["fcp"] = fcp_map; - } + fcp_map["device"] = uParts[1]:""; + fcp_map["wwpn"] = uParts[2]:""; + fcp_map["lun"] = uParts[3]:""; + fcp_map["bootprog"] = "0"; + fcp_map["br_lba"] = "0"; + configuration["fcp"] = fcp_map; + y2milestone ("ModifyReiplWithBootPartition: modified fcp map"); } else { - y2error ("ModifyReiplWithBootPartition: Should not be here!"); - - configuration = nil; + y2error ("ModifyReiplWithBootPartition: Should not be here, configuration unmodified!"); } return configuration; @@ -458,6 +436,18 @@ */ global map <string, any> ReadState () { map <string, any> configuration = $[]; + configuration["ccw"] = $[ + "device": "", + "loadparm": "", + "parm": "" /* SLES 11 and z/VM only */ + ]; + configuration["fcp"] = $[ + "device": "", + "wwpn": "", + "lun": "", + "bootprog": "", + "br_lba": "" + ]; if (!SanityCheck ()) { y2error ("Reipl::Read: SanityCheck failed!"); @@ -467,41 +457,23 @@ Especially, since this would currently popup three times during installation. */ - return nil; + return configuration; } if (ccw_exists) { - if (configuration["ccw"]:nil == nil) { - configuration["ccw"] = $[ - "device": "", - "loadparm": "" - ]; - } - map ccw_map = (map)configuration["ccw"]:nil; ccw_map["device"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/device"), "\n\r"); ccw_map["loadparm"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/loadparm"), "\n\r"); + ccw_map["parm"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/parm"), "\n\r"); /* SLES 11 and z/VM only */ configuration["ccw"] = ccw_map; } else { - y2error ("Reipl::Read: ccw is not configured."); - - configuration["ccw"] = nil; + y2warning ("Reipl::Read: ccw is not configured."); } if (fcp_exists) { - if (configuration["fcp"]:nil == nil) { - configuration["fcp"] = $[ - "device": "", - "wwpn": "", - "lun": "", - "bootprog": "", - "br_lba": "" - ]; - } - map fcp_map = (map)configuration["fcp"]:nil; fcp_map["device"] = deletechars ((string)SCR::Read (.target.string, fcp_directory + "/device"), "\n\r"); @@ -513,7 +485,7 @@ configuration["fcp"] = fcp_map; } else { - configuration["fcp"] = nil; + y2warning ("Reipl::Read: fcp is not configured."); } configuration["method"] = deletechars ((string)SCR::Read (.target.string, reipl_directory + "/reipl_type"), "\n\r"); @@ -590,6 +562,7 @@ rc = false; } + } else { y2error ("Reipl::WriteState: ccw_map is nil!"); @@ -695,7 +668,8 @@ map ccwIn = (map)settings["ccw"]:$[]; map ccwOut = $[ "device": "", - "loadparm": "" + "loadparm": "", + "parm": "" /* SLES 11 and z/VM only */ ]; if (ccwIn["device"]:nil != nil) { @@ -704,6 +678,10 @@ if (ccwIn["loadparm"]:nil != nil) { ccwOut["loadparm"] = ccwIn["loadparm"]:nil; } + /* SLES 11 and z/VM only */ + if (ccwIn["parm"]:nil != nil) { + ccwOut["parm"] = ccwIn["parm"]:nil; + } imported["ccw"] = ccwOut; } Modified: trunk/reipl/src/inst_reiplauto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/src/inst_reiplauto.ycp?rev… ============================================================================== --- trunk/reipl/src/inst_reiplauto.ycp (original) +++ trunk/reipl/src/inst_reiplauto.ycp Mon Feb 9 13:10:57 2009 @@ -65,14 +65,13 @@ boolean rc = true; - map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = nil; + map <string, any> configuration = Reipl::ReadState (); - if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); + if (configuration != nil) { + configuration = Reipl::ModifyReiplWithBootPartition (configuration); - if (newConfiguration != nil) { - Reipl::WriteState (newConfiguration); + if (configuration != nil) { + Reipl::WriteState (configuration); } else { y2error ("Could not modify reipl configuration"); Modified: trunk/reipl/src/reipl_bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/src/reipl_bootloader_finis… ============================================================================== --- trunk/reipl/src/reipl_bootloader_finish.ycp (original) +++ trunk/reipl/src/reipl_bootloader_finish.ycp Mon Feb 9 13:10:57 2009 @@ -20,42 +20,58 @@ textdomain "reipl"; - boolean different = false; + boolean different = true; string ipl_msg = ""; // Other architectures do not support it if (Arch::s390 ()) { map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = oldConfiguration; + map <string, any> newConfiguration = Reipl::ReadState (); if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); + newConfiguration = Reipl::ModifyReiplWithBootPartition (newConfiguration); map oldCcwMap = (map)oldConfiguration["ccw"]:nil; map newCcwMap = (map)newConfiguration["ccw"]:nil; map oldFcpMap = (map)oldConfiguration["fcp"]:nil; map newFcpMap = (map)newConfiguration["fcp"]:nil; - different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" - && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" - && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" - && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" - && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" - && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" - && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" - && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + different = (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b") + || (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b") + || (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b") + || (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b") + || (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b") + || (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b") + || (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b") + || (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b") + || (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"); + + y2milestone("(oldConfiguration['method']:'a' != newConfiguration['method']:'b') = %1", (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b")); + y2milestone("(oldCcwMap['device']:'a' != newCcwMap['device']:'b') = %1", (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b")); + y2milestone("(oldCcwMap['loadparm']:'a' != newCcwMap['loadparm']:'b') = %1", (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b")); + y2milestone("(oldCcwMap['parm']:'a' != newCcwMap['parm']:'b') = %1", (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b")); + y2milestone("(oldFcpMap['device']:'a' != newFcpMap['device']:'b') = %1", (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b")); + y2milestone("(oldFcpMap['wwpn']:'a' != newFcpMap['wwpn']:'b') = %1", (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b")); + y2milestone("(oldFcpMap['lun']:'a' != newFcpMap['lun']:'b') = %1", (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b")); + y2milestone("(oldFcpMap['bootprog']:'a' != newFcpMap['bootprog']:'b') = %1", (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b")); + y2milestone("(oldFcpMap['br_lba']:'a' != newFcpMap['br_lba']:'b') = %1", (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b")); + y2milestone("different = %1", different); + y2milestone("newConfiguration['method'] : %1", newConfiguration["method"]:"ERROR"); if (newConfiguration["method"]:"ERROR" == "ccw") { + y2milestone("making ccw ipl text"); string dev = substring (newCcwMap["device"]:"", 4, 4); // TRANSLATORS: part of a shutdown message // %1 is replaced with a device name // Newline at the end is required - ipl_msg = sformat (_("After shutdown, reload the system + ipl_msg = sformat (_(" +After shutdown, reload the system with an IPL from DASD '%1'. "), dev); } else if (newConfiguration["method"]:"ERROR" == "fcp") { + y2milestone("making fcp ipl text"); string dev = substring (newFcpMap["device"]:"", 4, 4); string wwpn = newFcpMap["wwpn"]:""; string lun = newFcpMap["lun"]:""; @@ -65,13 +81,24 @@ // %2 is replaced with a WWPN name // %3 is replaced with a LUN name // Newline at the end is required - ipl_msg = sformat (_("After shutdown, reload the system -with an IPL from FCP '%1' with WWPN '%2' + ipl_msg = sformat (_(" +After shutdown, reload the system +with an IPL from FCP '%1' +with WWPN '%2' and LUN '%3'. "), dev, wwpn, lun); + } else { + y2warning("cannot make ipl text for unknown method"); } } } - return $["different":different, "ipl_msg":ipl_msg]; -} \ No newline at end of file + y2milestone ("Configuration (reIPL) has been changed: %1", different); + y2milestone ("Configuration (reIPL) generated shutdown dialog box message: %1", ipl_msg); + + map <string, any> ret = $["different":different, "ipl_msg":ipl_msg]; + + y2milestone("ret = %1", ret); + + return ret; +} Modified: trunk/reipl/src/reipl_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/src/reipl_finish.ycp?rev=5… ============================================================================== --- trunk/reipl/src/reipl_finish.ycp (original) +++ trunk/reipl/src/reipl_finish.ycp Mon Feb 9 13:10:57 2009 @@ -16,33 +16,46 @@ import "Arch"; import "Reipl"; - boolean different = false; + boolean different = true; // Other architectures do not support it if (Arch::s390 ()) { map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = oldConfiguration; + map <string, any> newConfiguration = Reipl::ReadState (); if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); + newConfiguration = Reipl::ModifyReiplWithBootPartition (newConfiguration); map oldCcwMap = (map)oldConfiguration["ccw"]:nil; map newCcwMap = (map)newConfiguration["ccw"]:nil; map oldFcpMap = (map)oldConfiguration["fcp"]:nil; map newFcpMap = (map)newConfiguration["fcp"]:nil; - different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" - && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" - && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" - && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" - && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" - && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" - && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" - && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + different = (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b") + || (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b") + || (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b") + || (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b") + || (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b") + || (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b") + || (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b") + || (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b") + || (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"); + + y2milestone("(oldConfiguration['method']:'a' != newConfiguration['method']:'b') = %1", (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b")); + y2milestone("(oldCcwMap['device']:'a' != newCcwMap['device']:'b') = %1", (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b")); + y2milestone("(oldCcwMap['loadparm']:'a' != newCcwMap['loadparm']:'b') = %1", (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b")); + y2milestone("(oldCcwMap['parm']:'a' != newCcwMap['parm']:'b') = %1", (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b")); + y2milestone("(oldFcpMap['device']:'a' != newFcpMap['device']:'b') = %1", (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b")); + y2milestone("(oldFcpMap['wwpn']:'a' != newFcpMap['wwpn']:'b') = %1", (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b")); + y2milestone("(oldFcpMap['lun']:'a' != newFcpMap['lun']:'b') = %1", (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b")); + y2milestone("(oldFcpMap['bootprog']:'a' != newFcpMap['bootprog']:'b') = %1", (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b")); + y2milestone("(oldFcpMap['br_lba']:'a' != newFcpMap['br_lba']:'b') = %1", (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b")); + y2milestone("different = %1", different); + } y2milestone ("Configuration (reIPL) has been changed: %1", different); } return different; -} \ No newline at end of file +} -- 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] r55343 - in /branches/SuSE-Code-11-Branch/reipl: package/yast2-reipl.changes src/Reipl.ycp src/inst_reiplauto.ycp src/reipl_bootloader_finish.ycp src/reipl_finish.ycp
by jsrain＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: jsrain Date: Mon Feb 9 13:10:02 2009 New Revision: 55343 URL: http://svn.opensuse.org/viewcvs/yast?rev=55343&view=rev Log: Final fix for reboot (bnc#471522) Modified: branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp Modified: branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes (original) +++ branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes Mon Feb 9 13:10:02 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 9 09:38:05 CET 2009 - hare(a)suse.de + +- Final fix for reboot (bnc#471522) + +------------------------------------------------------------------- Fri Feb 6 11:28:36 CET 2009 - jsrain(a)suse.cz - fixed rebooting (bnc #471522) Modified: branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp Mon Feb 9 13:10:02 2009 @@ -137,7 +137,8 @@ // "method": "ccw", // "ccw": $[ // "device": "0.0.4711", -// "loadparm": "" +// "loadparm": "", +// "parm": "" /* SLES 11 and z/VM only */ // ], // "fcp": $[ // "device": "0.0.4711", @@ -184,6 +185,7 @@ y2error ("Missing loadparm under %1", ccw_directory); return false; } + // don't check for "parm" since it might not be there under zLPAR } if (fcp_exists) { @@ -363,12 +365,13 @@ } /** - * Modifys the reipl configuration passed in with what it should be for the detected + * Returns the reipl configuration passed in with what it should be for the detected * boot partition. - * @param configuration the current configuration. - * @return a map of the new configuration. + * @param configuration an old configuration. + * @return a map of the new target configuration. */ global map <string, any> ModifyReiplWithBootPartition (map <string, any> configuration) { + // get target information list<string> uParts = FindBootPartition (); if (uParts == nil) { @@ -380,12 +383,7 @@ if (size (uParts) == 2) { if (uParts[0]:"" == "ccw") { - if (ccw_exists) { fCCW = true; - } - else { - y2error ("ModifyReiplWithBootPartition: udevPath uses ccw but ccw is not implemented!"); - } } else { y2error ("ModifyReiplWithBootPartition: size of uParts is 2, but first word is not ccw!"); @@ -393,12 +391,7 @@ } else if (size (uParts) == 4) { if (uParts[0]:"" == "zfcp") { - if (fcp_exists) { fFCP = true; - } - else { - y2error ("ModifyReiplWithBootPartition: udevPath uses fcp but fcp is not implemented!"); - } } else { y2error ("ModifyReiplWithBootPartition: size of uParts is 4, but format is not what we expect"); @@ -409,44 +402,29 @@ } if (fCCW) { - configuration["method"] = "ccw"; + configuration["method"] = "ccw"; map ccw_map = (map)configuration["ccw"]:nil; - if (ccw_map == nil) { - y2error ("ModifyReiplWithBootPartition: ccw does not exist in configuration"); - - configuration = nil; - } - else { - ccw_map["device"] = uParts[1]:""; - ccw_map["loadparm"] = ""; - - configuration["ccw"] = ccw_map; - } + ccw_map["device"] = uParts[1]:""; + ccw_map["loadparm"] = ""; + //ccw_map["parm"] = ""; /* SLES 11 and z/VM only */ // read only + configuration["ccw"] = ccw_map; + y2milestone ("ModifyReiplWithBootPartition: modified ccw map"); } else if (fFCP) { configuration["method"] = "fcp"; map fcp_map = (map)configuration["fcp"]:nil; - if (fcp_map == nil) { - y2error ("ModifyReiplWithBootPartition: ccw does not exist in configuration"); - - configuration = nil; - } - else { - fcp_map["device"] = uParts[1]:""; - fcp_map["wwpn"] = uParts[2]:""; - fcp_map["lun"] = uParts[3]:""; - fcp_map["bootprog"] = ""; - fcp_map["br_lba"] = ""; - - configuration["fcp"] = fcp_map; - } + fcp_map["device"] = uParts[1]:""; + fcp_map["wwpn"] = uParts[2]:""; + fcp_map["lun"] = uParts[3]:""; + fcp_map["bootprog"] = "0"; + fcp_map["br_lba"] = "0"; + configuration["fcp"] = fcp_map; + y2milestone ("ModifyReiplWithBootPartition: modified fcp map"); } else { - y2error ("ModifyReiplWithBootPartition: Should not be here!"); - - configuration = nil; + y2error ("ModifyReiplWithBootPartition: Should not be here, configuration unmodified!"); } return configuration; @@ -458,6 +436,18 @@ */ global map <string, any> ReadState () { map <string, any> configuration = $[]; + configuration["ccw"] = $[ + "device": "", + "loadparm": "", + "parm": "" /* SLES 11 and z/VM only */ + ]; + configuration["fcp"] = $[ + "device": "", + "wwpn": "", + "lun": "", + "bootprog": "", + "br_lba": "" + ]; if (!SanityCheck ()) { y2error ("Reipl::Read: SanityCheck failed!"); @@ -467,41 +457,23 @@ Especially, since this would currently popup three times during installation. */ - return nil; + return configuration; } if (ccw_exists) { - if (configuration["ccw"]:nil == nil) { - configuration["ccw"] = $[ - "device": "", - "loadparm": "" - ]; - } - map ccw_map = (map)configuration["ccw"]:nil; ccw_map["device"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/device"), "\n\r"); ccw_map["loadparm"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/loadparm"), "\n\r"); + ccw_map["parm"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/parm"), "\n\r"); /* SLES 11 and z/VM only */ configuration["ccw"] = ccw_map; } else { - y2error ("Reipl::Read: ccw is not configured."); - - configuration["ccw"] = nil; + y2warning ("Reipl::Read: ccw is not configured."); } if (fcp_exists) { - if (configuration["fcp"]:nil == nil) { - configuration["fcp"] = $[ - "device": "", - "wwpn": "", - "lun": "", - "bootprog": "", - "br_lba": "" - ]; - } - map fcp_map = (map)configuration["fcp"]:nil; fcp_map["device"] = deletechars ((string)SCR::Read (.target.string, fcp_directory + "/device"), "\n\r"); @@ -513,7 +485,7 @@ configuration["fcp"] = fcp_map; } else { - configuration["fcp"] = nil; + y2warning ("Reipl::Read: fcp is not configured."); } configuration["method"] = deletechars ((string)SCR::Read (.target.string, reipl_directory + "/reipl_type"), "\n\r"); @@ -590,6 +562,7 @@ rc = false; } + } else { y2error ("Reipl::WriteState: ccw_map is nil!"); @@ -695,7 +668,8 @@ map ccwIn = (map)settings["ccw"]:$[]; map ccwOut = $[ "device": "", - "loadparm": "" + "loadparm": "", + "parm": "" /* SLES 11 and z/VM only */ ]; if (ccwIn["device"]:nil != nil) { @@ -704,6 +678,10 @@ if (ccwIn["loadparm"]:nil != nil) { ccwOut["loadparm"] = ccwIn["loadparm"]:nil; } + /* SLES 11 and z/VM only */ + if (ccwIn["parm"]:nil != nil) { + ccwOut["parm"] = ccwIn["parm"]:nil; + } imported["ccw"] = ccwOut; } Modified: branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp Mon Feb 9 13:10:02 2009 @@ -65,14 +65,13 @@ boolean rc = true; - map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = nil; + map <string, any> configuration = Reipl::ReadState (); - if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); + if (configuration != nil) { + configuration = Reipl::ModifyReiplWithBootPartition (configuration); - if (newConfiguration != nil) { - Reipl::WriteState (newConfiguration); + if (configuration != nil) { + Reipl::WriteState (configuration); } else { y2error ("Could not modify reipl configuration"); Modified: branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp Mon Feb 9 13:10:02 2009 @@ -20,42 +20,58 @@ textdomain "reipl"; - boolean different = false; + boolean different = true; string ipl_msg = ""; // Other architectures do not support it if (Arch::s390 ()) { map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = oldConfiguration; + map <string, any> newConfiguration = Reipl::ReadState (); if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); + newConfiguration = Reipl::ModifyReiplWithBootPartition (newConfiguration); map oldCcwMap = (map)oldConfiguration["ccw"]:nil; map newCcwMap = (map)newConfiguration["ccw"]:nil; map oldFcpMap = (map)oldConfiguration["fcp"]:nil; map newFcpMap = (map)newConfiguration["fcp"]:nil; - different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" - && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" - && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" - && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" - && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" - && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" - && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" - && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + different = (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b") + || (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b") + || (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b") + || (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b") + || (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b") + || (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b") + || (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b") + || (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b") + || (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"); + + y2milestone("(oldConfiguration['method']:'a' != newConfiguration['method']:'b') = %1", (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b")); + y2milestone("(oldCcwMap['device']:'a' != newCcwMap['device']:'b') = %1", (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b")); + y2milestone("(oldCcwMap['loadparm']:'a' != newCcwMap['loadparm']:'b') = %1", (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b")); + y2milestone("(oldCcwMap['parm']:'a' != newCcwMap['parm']:'b') = %1", (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b")); + y2milestone("(oldFcpMap['device']:'a' != newFcpMap['device']:'b') = %1", (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b")); + y2milestone("(oldFcpMap['wwpn']:'a' != newFcpMap['wwpn']:'b') = %1", (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b")); + y2milestone("(oldFcpMap['lun']:'a' != newFcpMap['lun']:'b') = %1", (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b")); + y2milestone("(oldFcpMap['bootprog']:'a' != newFcpMap['bootprog']:'b') = %1", (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b")); + y2milestone("(oldFcpMap['br_lba']:'a' != newFcpMap['br_lba']:'b') = %1", (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b")); + y2milestone("different = %1", different); + y2milestone("newConfiguration['method'] : %1", newConfiguration["method"]:"ERROR"); if (newConfiguration["method"]:"ERROR" == "ccw") { + y2milestone("making ccw ipl text"); string dev = substring (newCcwMap["device"]:"", 4, 4); // TRANSLATORS: part of a shutdown message // %1 is replaced with a device name // Newline at the end is required - ipl_msg = sformat (_("After shutdown, reload the system + ipl_msg = sformat (_(" +After shutdown, reload the system with an IPL from DASD '%1'. "), dev); } else if (newConfiguration["method"]:"ERROR" == "fcp") { + y2milestone("making fcp ipl text"); string dev = substring (newFcpMap["device"]:"", 4, 4); string wwpn = newFcpMap["wwpn"]:""; string lun = newFcpMap["lun"]:""; @@ -65,13 +81,24 @@ // %2 is replaced with a WWPN name // %3 is replaced with a LUN name // Newline at the end is required - ipl_msg = sformat (_("After shutdown, reload the system -with an IPL from FCP '%1' with WWPN '%2' + ipl_msg = sformat (_(" +After shutdown, reload the system +with an IPL from FCP '%1' +with WWPN '%2' and LUN '%3'. "), dev, wwpn, lun); + } else { + y2warning("cannot make ipl text for unknown method"); } } } - return $["different":different, "ipl_msg":ipl_msg]; -} \ No newline at end of file + y2milestone ("Configuration (reIPL) has been changed: %1", different); + y2milestone ("Configuration (reIPL) generated shutdown dialog box message: %1", ipl_msg); + + map <string, any> ret = $["different":different, "ipl_msg":ipl_msg]; + + y2milestone("ret = %1", ret); + + return ret; +} Modified: branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp Mon Feb 9 13:10:02 2009 @@ -16,33 +16,46 @@ import "Arch"; import "Reipl"; - boolean different = false; + boolean different = true; // Other architectures do not support it if (Arch::s390 ()) { map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = oldConfiguration; + map <string, any> newConfiguration = Reipl::ReadState (); if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); + newConfiguration = Reipl::ModifyReiplWithBootPartition (newConfiguration); map oldCcwMap = (map)oldConfiguration["ccw"]:nil; map newCcwMap = (map)newConfiguration["ccw"]:nil; map oldFcpMap = (map)oldConfiguration["fcp"]:nil; map newFcpMap = (map)newConfiguration["fcp"]:nil; - different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" - && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" - && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" - && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" - && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" - && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" - && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" - && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; + different = (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b") + || (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b") + || (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b") + || (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b") + || (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b") + || (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b") + || (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b") + || (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b") + || (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"); + + y2milestone("(oldConfiguration['method']:'a' != newConfiguration['method']:'b') = %1", (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b")); + y2milestone("(oldCcwMap['device']:'a' != newCcwMap['device']:'b') = %1", (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b")); + y2milestone("(oldCcwMap['loadparm']:'a' != newCcwMap['loadparm']:'b') = %1", (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b")); + y2milestone("(oldCcwMap['parm']:'a' != newCcwMap['parm']:'b') = %1", (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b")); + y2milestone("(oldFcpMap['device']:'a' != newFcpMap['device']:'b') = %1", (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b")); + y2milestone("(oldFcpMap['wwpn']:'a' != newFcpMap['wwpn']:'b') = %1", (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b")); + y2milestone("(oldFcpMap['lun']:'a' != newFcpMap['lun']:'b') = %1", (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b")); + y2milestone("(oldFcpMap['bootprog']:'a' != newFcpMap['bootprog']:'b') = %1", (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b")); + y2milestone("(oldFcpMap['br_lba']:'a' != newFcpMap['br_lba']:'b') = %1", (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b")); + y2milestone("different = %1", different); + } y2milestone ("Configuration (reIPL) has been changed: %1", different); } return different; -} \ No newline at end of file +} -- 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] r55342 - in /trunk/ncurses/src: NCFileSelection.cc NCFileSelection.h
by gs＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: gs Date: Mon Feb 9 13:08:54 2009 New Revision: 55342 URL: http://svn.opensuse.org/viewcvs/yast?rev=55342&view=rev Log: correct references to YTableItem (addLine()/ getTag()), NCFileSelectionTag derived from YTableCell Modified: trunk/ncurses/src/NCFileSelection.cc trunk/ncurses/src/NCFileSelection.h Modified: trunk/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCFileSelection.cc?r… ============================================================================== --- trunk/ncurses/src/NCFileSelection.cc (original) +++ trunk/ncurses/src/NCFileSelection.cc Mon Feb 9 13:08:54 2009 @@ -140,26 +140,21 @@ } -NCFileSelectionTag::NCFileSelectionTag( const NCFileInfo & info ) - : NCTableCol( NCstring( " " ), SEPARATOR ) +NCFileSelectionTag::NCFileSelectionTag( NCFileInfo * info ) + : YTableCell( " " ) , fileInfo( info ) { - + setLabel( fileInfo->_tag ); } - -void NCFileSelectionTag::DrawAt( NCursesWindow & w, const wrect at, - NCTableStyle & tableStyle, - NCTableLine::STATE linestate, - unsigned colidx ) const +NCFileSelectionTag::~NCFileSelectionTag() { - NCTableCol::DrawAt( w, at, tableStyle, linestate, colidx ); - - w.addch( at.Pos.L, at.Pos.C, fileInfo._tag.c_str()[0] ); - w.addch( at.Pos.L, at.Pos.C + 1, fileInfo._tag.c_str()[1] ); + if ( fileInfo ) + { + delete fileInfo; + } } - NCFileSelection::NCFileSelection( YWidget * parent, YTableHeader * tableHeader, NCFileSelectionType type, @@ -214,8 +209,8 @@ if ( index != -1 ) { - NCFileInfo info = getFileInfo( index ); - return info._name; + NCFileInfo * info = getFileInfo( index ); + return info->_name; } else { @@ -227,7 +222,7 @@ void NCFileSelection::setCurrentDir() { string selected = getCurrentLine(); - yuiMilestone() << "Current line: " << selected << endl; + yuiMilestone() << "Current directory: " << selected << endl; if ( selected != ".." ) { @@ -257,20 +252,18 @@ void NCFileSelection::addLine( const vector<string> & elements, - const NCFileInfo & info ) + NCFileInfo * info ) { - vector<NCTableCol*> Items( elements.size() + 1, 0 ); + YTableItem *tabItem = new YTableItem(); - // fill first column (containing the file information) - Items[0] = new NCFileSelectionTag( info ); + tabItem->addCell( new NCFileSelectionTag( info ) ); - for ( unsigned i = 1; i < elements.size() + 1; ++i ) - { - // use NCstring to enforce recoding from 'utf8' - Items[i] = new NCTableCol( NCstring( elements[i-1] ), NCTableCol::PLAIN ); + for ( unsigned i = 1; i < elements.size()+1; ++i ) { + tabItem->addCell( elements[i-1] ); } - myPad()->Append( Items ); + // use all-at-once insertion mode - DrawPad() is called only after the loop + addItem(tabItem, true); } @@ -280,7 +273,7 @@ } -bool NCFileTable::createListEntry( const NCFileInfo & fileInfo ) +bool NCFileTable::createListEntry( NCFileInfo * fileInfo ) { vector<string> data; @@ -289,23 +282,21 @@ case T_Overview: { data.reserve( 2 ); - data.push_back( fileInfo._name ); + data.push_back( fileInfo->_name ); break; } - case T_Detailed: { data.reserve( 6 ); - data.push_back( fileInfo._name ); + data.push_back( fileInfo->_name ); char size_buf[50]; - sprintf( size_buf, "%lld", fileInfo._size ); + sprintf( size_buf, "%lld", fileInfo->_size ); data.push_back( size_buf ); - data.push_back( fileInfo._perm ); - data.push_back( fileInfo._user ); - data.push_back( fileInfo._group ); + data.push_back( fileInfo->_perm ); + data.push_back( fileInfo->_user ); + data.push_back( fileInfo->_group ); break; } - default: { data.reserve( 2 ); @@ -321,7 +312,7 @@ } -bool NCDirectoryTable::createListEntry( const NCFileInfo & fileInfo ) +bool NCDirectoryTable::createListEntry( NCFileInfo * fileInfo ) { vector<string> data; @@ -330,20 +321,18 @@ case T_Overview: { data.reserve( 2 ); - data.push_back( fileInfo._name ); + data.push_back( fileInfo->_name ); break; } - case T_Detailed: { data.reserve( 4 ); - data.push_back( fileInfo._name ); - data.push_back( fileInfo._perm ); - data.push_back( fileInfo._user ); - data.push_back( fileInfo._group ); + data.push_back( fileInfo->_name ); + data.push_back( fileInfo->_perm ); + data.push_back( fileInfo->_user ); + data.push_back( fileInfo->_group ); break; } - default: { data.reserve( 2 ); @@ -359,13 +348,13 @@ } -NCFileInfo NCFileSelection::getFileInfo( int index ) +NCFileInfo * NCFileSelection::getFileInfo( int index ) { // get the tag NCFileSelectionTag *cc = getTag( index ); if ( !cc ) - return NCFileInfo( ); + return 0; return cc->getFileInfo(); } @@ -380,8 +369,10 @@ return 0; // get first column (the column containing the status info) - NCFileSelectionTag * cc = static_cast<NCFileSelectionTag *>( cl->GetCol( 0 ) ); - + YTableItem *it = dynamic_cast<YTableItem*> (cl->origItem() ); + YTableCell *tcell = it->cell(0); + NCFileSelectionTag * cc = static_cast<NCFileSelectionTag *>( tcell ); + return cc; } @@ -593,7 +584,7 @@ if ((( *it ) == ".." && currentDir != "/" ) || ( *it ) != ".." ) { - createListEntry( NCFileInfo(( *it ), &statInfo ) ); + createListEntry( new NCFileInfo(( *it ), &statInfo ) ); } } else if ( S_ISLNK( statInfo.st_mode ) ) @@ -602,7 +593,7 @@ { if ( S_ISREG( linkInfo.st_mode ) ) { - createListEntry( NCFileInfo(( *it ), &linkInfo, true ) ); + createListEntry( new NCFileInfo(( *it ), &linkInfo, true ) ); } } } @@ -731,7 +722,7 @@ if ((( *it ) == ".." && currentDir != "/" ) || ( *it ) != ".." ) { - createListEntry( NCFileInfo(( *it ), &statInfo ) ); + createListEntry( new NCFileInfo(( *it ), &statInfo ) ); } } else if ( S_ISLNK( statInfo.st_mode ) ) @@ -740,7 +731,7 @@ { if ( S_ISDIR( linkInfo.st_mode ) ) { - createListEntry( NCFileInfo(( *it ), &linkInfo, true ) ); + createListEntry( new NCFileInfo(( *it ), &linkInfo, true ) ); } } } Modified: trunk/ncurses/src/NCFileSelection.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCFileSelection.h?re… ============================================================================== --- trunk/ncurses/src/NCFileSelection.h (original) +++ trunk/ncurses/src/NCFileSelection.h Mon Feb 9 13:08:54 2009 @@ -74,25 +74,20 @@ * This class is used for the first column of the file table. * Contains the file data. **/ -class NCFileSelectionTag : public NCTableCol +class NCFileSelectionTag : public YTableCell { private: - NCFileInfo fileInfo; + NCFileInfo * fileInfo; public: - NCFileSelectionTag( const NCFileInfo & info ); + NCFileSelectionTag( NCFileInfo * info ); - virtual ~NCFileSelectionTag() {} + ~NCFileSelectionTag(); - virtual void DrawAt( NCursesWindow & w, const wrect at, - NCTableStyle & tableStyle, - NCTableLine::STATE linestate, - unsigned colidx ) const; - - NCFileInfo getFileInfo() const { return fileInfo; } + NCFileInfo * getFileInfo() const { return fileInfo; } }; @@ -146,7 +141,7 @@ * index: The list index * return: fileInfo Information about the file (directory) */ - NCFileInfo getFileInfo( int index ); + NCFileInfo * getFileInfo( int index ); /** * Set the type of the table widget @@ -155,7 +150,7 @@ void setTableType( NCFileSelectionType type ) { tableType = type; }; virtual void addLine( const vector<string> & elements, - const NCFileInfo & fileInfo ); + NCFileInfo * fileInfo ); /** * Get number of lines ( list entries ) @@ -181,7 +176,7 @@ /** * Creates a line in the package table. */ - virtual bool createListEntry( const NCFileInfo & fileInfo ) = 0; + virtual bool createListEntry( NCFileInfo * fileInfo ) = 0; /** * Get the current directory @@ -238,7 +233,7 @@ virtual void fillHeader(); - virtual bool createListEntry( const NCFileInfo & fileInfo ); + virtual bool createListEntry( NCFileInfo * fileInfo ); /** * Fill the list of files @@ -262,7 +257,7 @@ virtual void fillHeader(); - virtual bool createListEntry( const NCFileInfo & fileInfo ); + virtual bool createListEntry( NCFileInfo * fileInfo ); /** * Fill the list of directories. -- 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] r55341 - /tags/branch-Code-11-2_17_13/security/
by lslezak＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: lslezak Date: Mon Feb 9 12:29:41 2009 New Revision: 55341 URL: http://svn.opensuse.org/viewcvs/yast?rev=55341&view=rev Log: Created tag branch-Code-11-2_17_13 for security Added: tags/branch-Code-11-2_17_13/security/ - copied from r55340, branches/SuSE-Code-11-Branch/security/ -- 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] r55340 - in /branches/SuSE-Code-11-Branch/security: VERSION package/yast2-security.changes src/Security.ycp
by lslezak＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: lslezak Date: Mon Feb 9 12:29:15 2009 New Revision: 55340 URL: http://svn.opensuse.org/viewcvs/yast?rev=55340&view=rev Log: - added "SuSEfirewall" and "earlysyslog" service to ignore list of extra services in runlevel 3 and 5 (bnc#473345) - 2.17.13 Modified: branches/SuSE-Code-11-Branch/security/VERSION branches/SuSE-Code-11-Branch/security/package/yast2-security.changes branches/SuSE-Code-11-Branch/security/src/Security.ycp Modified: branches/SuSE-Code-11-Branch/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/security/… ============================================================================== --- branches/SuSE-Code-11-Branch/security/VERSION (original) +++ branches/SuSE-Code-11-Branch/security/VERSION Mon Feb 9 12:29:15 2009 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: branches/SuSE-Code-11-Branch/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/security/… ============================================================================== --- branches/SuSE-Code-11-Branch/security/package/yast2-security.changes (original) +++ branches/SuSE-Code-11-Branch/security/package/yast2-security.changes Mon Feb 9 12:29:15 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 9 11:58:17 CET 2009 - lslezak(a)suse.cz + +- added "SuSEfirewall" and "earlysyslog" service to ignore list + of extra services in runlevel 3 and 5 (bnc#473345) +- 2.17.13 + +------------------------------------------------------------------- Fri Nov 28 13:29:35 CET 2008 - ug(a)suse.de - conflict in rnc file fixed Modified: branches/SuSE-Code-11-Branch/security/src/Security.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/security/… ============================================================================== --- branches/SuSE-Code-11-Branch/security/src/Security.ycp (original) +++ branches/SuSE-Code-11-Branch/security/src/Security.ycp Mon Feb 9 12:29:15 2009 @@ -29,7 +29,7 @@ "consolekit", "haldaemon", "network", "syslog", "auditd", "splash_early", "alsasound", "irq_balancer", "kbd", "powersaved", "splash", "sshd", "earlyxdm", "hotkey-setup", "atd", "nscd", "smpppd", "xend", "autofs", "libvirtd", "sendmail", "postfix", "xendomains", "cron", "ddclient", - "smartd", "stopblktrace", "ntp" + "smartd", "stopblktrace", "ntp", "SuSEfirewall", "earlysyslog" ]; // All other services should be turned off -- 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] r55339 - in /trunk/security: package/yast2-security.changes src/Security.ycp
by lslezak＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: lslezak Date: Mon Feb 9 12:23:41 2009 New Revision: 55339 URL: http://svn.opensuse.org/viewcvs/yast?rev=55339&view=rev Log: - added "SuSEfirewall" and "earlysyslog" service to ignore list of extra services in runlevel 3 and 5 (bnc#473345) Modified: trunk/security/package/yast2-security.changes trunk/security/src/Security.ycp Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Mon Feb 9 12:23:41 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 9 11:58:17 CET 2009 - lslezak(a)suse.cz + +- added "SuSEfirewall" and "earlysyslog" service to ignore list + of extra services in runlevel 3 and 5 (bnc#473345) + +------------------------------------------------------------------- Wed Jan 21 10:09:02 CET 2009 - jsuchome(a)suse.cz - removed progress dialog during read (bnc#447584) Modified: trunk/security/src/Security.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/Security.ycp?rev=55… ============================================================================== --- trunk/security/src/Security.ycp (original) +++ trunk/security/src/Security.ycp Mon Feb 9 12:23:41 2009 @@ -29,7 +29,7 @@ "consolekit", "haldaemon", "network", "syslog", "auditd", "splash_early", "alsasound", "irq_balancer", "kbd", "powersaved", "splash", "sshd", "earlyxdm", "hotkey-setup", "atd", "nscd", "smpppd", "xend", "autofs", "libvirtd", "sendmail", "postfix", "xendomains", "cron", "ddclient", - "smartd", "stopblktrace", "ntp" + "smartd", "stopblktrace", "ntp", "SuSEfirewall", "earlysyslog" ]; // All other services should be turned off -- 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] r55338 - /trunk/autoinstallation/src/modules/AutoinstSoftware.ycp
by ug＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: ug Date: Mon Feb 9 12:20:36 2009 New Revision: 55338 URL: http://svn.opensuse.org/viewcvs/yast?rev=55338&view=rev Log: *ups* :) Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Mon Feb 9 12:20:36 2009 @@ -468,13 +468,9 @@ /* remove all packages that are pulled in by the resolver anyway */ list<string> tmp = []; patternPackagesTemp = toset( patternPackagesTemp ); - y2milestone("patternPackagesTemp = %1", patternPackagesTemp); foreach( string ppackage, patternPackagesTemp, ``{ - y2milestone("UWE1"); foreach( map<string,any> d, Pkg::ResolvableDependencies (ppackage, `package, ""), ``{ - y2milestone("UWE2"); foreach( map<string,any> dd, d["dependencies"]:[], ``{ - y2milestone("UWE3"); if( dd["res_kind"]:"" == "package" && (dd["dep_kind"]:"" == "requires" || dd["dep_kind"]:"" == "recommends") && !contains(patternPackages , dd["name"]:"") ) { patternPackages = add(patternPackages, dd["name"]:""); tmp = add(tmp, dd["name"]:""); -- 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] r55337 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstSoftware.ycp src/modules/Profile.ycp src/modules/ProfileLocation.ycp
by ug＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: ug Date: Mon Feb 9 12:19:36 2009 New Revision: 55337 URL: http://svn.opensuse.org/viewcvs/yast?rev=55337&view=rev Log: shell escape added for the password for encrypted profiles. speed up software cloning with many repositories. clean up Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstSoftware.ycp trunk/autoinstallation/src/modules/Profile.ycp trunk/autoinstallation/src/modules/ProfileLocation.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Feb 9 12:19:36 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 9 11:19:44 CET 2009 - ug(a)suse.de + +- shell escape added for the password for encrypted profiles +- speed up software cloning with many repositories +- clean up + +------------------------------------------------------------------- Fri Feb 6 15:56:28 CET 2009 - ug(a)suse.de - Wrapper for LibStorage::humanStringToByte added Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Mon Feb 9 12:19:36 2009 @@ -263,71 +263,6 @@ } } - if (haskey(Profile::current, "inetd")) { - map conf = Profile::current["inetd"]:$[]; - if (conf["netd_service"]:`none == `xinetd ) - allpackages = (list<string>) union(allpackages, - ["xinetd"]); - else - allpackages = (list<string>) union(allpackages, - ["inetd"]); - - } - - if (haskey(Profile::current, "nis")) { - map conf = Profile::current["nis"]:$[]; - if (conf["start_nis"]:false) - allpackages = (list<string>) union(allpackages, ["yast2-nis-client","ypbind"]); - - if (conf["start_autofs"]:false) - { - string pkg = "autofs4"; - allpackages = add (allpackages, pkg); - } - } - - if (haskey(Profile::current, "security")) { - allpackages = (list<string>) union(allpackages, - ["yast2-security"]); - } - - if (haskey(Profile::current, "ldap")) { - map ldapclient = Profile::current["ldap"]:$[]; - if (ldapclient["start_ldap"]:false) - allpackages = (list<string>) union(allpackages, ["pam_ldap","nss_ldap"]); - if (ldapclient["start_autofs"]:false) - { - string pkg = "autofs4"; - allpackages = add (allpackages, pkg); - } - } - - if (haskey(Profile::current, "nfs_server")) - { - boolean start_nfsserver = Profile::current["nfs_server", "start_nfsserver"]:false; - if (start_nfsserver) - allpackages = (list<string>) union(allpackages, ["yast2-nfs-server", "nfs-kernel-server"]); - } - - - if (haskey(Profile::current, "mail")) { - map mail = Profile::current["mail"]:$[]; - if (mail["mta"]:`other == `postfix) - { - allpackages = add(allpackages, "postfix"); - PackageAI::toremove = add(PackageAI::toremove, "sendmail"); - if (mail["use_amavis"]:false) - allpackages = add(allpackages, "amavis-postfix"); - } - else if (mail["mta"]:`other == `sendmail) - { - allpackages = add(allpackages, "sendmail"); - PackageAI::toremove = add(PackageAI::toremove, "postfix"); - - if (mail["use_amavis"]:false) - allpackages = add(allpackages, "amavis-sendmail"); - } - } return allpackages; } @@ -532,9 +467,14 @@ emergency_break = emergency_break + 1; /* remove all packages that are pulled in by the resolver anyway */ list<string> tmp = []; + patternPackagesTemp = toset( patternPackagesTemp ); + y2milestone("patternPackagesTemp = %1", patternPackagesTemp); foreach( string ppackage, patternPackagesTemp, ``{ + y2milestone("UWE1"); foreach( map<string,any> d, Pkg::ResolvableDependencies (ppackage, `package, ""), ``{ + y2milestone("UWE2"); foreach( map<string,any> dd, d["dependencies"]:[], ``{ + y2milestone("UWE3"); if( dd["res_kind"]:"" == "package" && (dd["dep_kind"]:"" == "requires" || dd["dep_kind"]:"" == "recommends") && !contains(patternPackages , dd["name"]:"") ) { patternPackages = add(patternPackages, dd["name"]:""); tmp = add(tmp, dd["name"]:""); @@ -561,7 +501,7 @@ software["packages"] = sort( filter(string pkg, userpackages, ``(! regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) ); software["patterns"] = sort( visible_patterns ); - software["remove-packages"] = sort( removepackages ); + software["remove-packages"] = toset( removepackages ); return software; } Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Pro… ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Mon Feb 9 12:19:36 2009 @@ -359,7 +359,7 @@ } until ( button == `ok ); UI::CloseDialog(); } while( p != q ); - AutoinstConfig::ProfilePassword = p; + AutoinstConfig::ProfilePassword = AutoinstConfig::ShellEscape((string)p); } string dir = (string)SCR::Read(.target.tmpdir); string command = sformat("gpg2 -c --armor --batch --passphrase \"%1\" --output %2/encrypted_autoyast.xml", Modified: trunk/autoinstallation/src/modules/ProfileLocation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Pro… ============================================================================== --- trunk/autoinstallation/src/modules/ProfileLocation.ycp (original) +++ trunk/autoinstallation/src/modules/ProfileLocation.ycp Mon Feb 9 12:19:36 2009 @@ -69,9 +69,9 @@ AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir)+"/"+AutoinstConfig::host; } if( (string)SCR::Read(.etc.install_inf.Server) != nil ) { - AutoinstConfig::host = (string)SCR::Read(.etc.install_inf.Server); + AutoinstConfig::host = (string)SCR::Read(.etc.install_inf.Server); + } } - } y2milestone("relurl for profile changed to: %1://%2%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath); SCR::Write ( .etc.install_inf.ayrelurl, sformat("%1://%2/%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath) ); -- 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] r55336 - /trunk/storage/storage/src/include/ep-dialogs.ycp
by aschnell＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: aschnell Date: Mon Feb 9 11:57:23 2009 New Revision: 55336 URL: http://svn.opensuse.org/viewcvs/yast?rev=55336&view=rev Log: - normal rounding during resize of partitions Modified: trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Mon Feb 9 11:57:23 2009 @@ -787,8 +787,9 @@ { case `primary: case `logical: - data["region", 1] = Integer::Clamp(PartedSizeToCly((tofloat(size_k*1024)), cyl_size), - 1, data["region", 1]:0 + free_cyl_after); + integer num_cyl = tointeger(1024.0 * size_k / cyl_size + 0.5); + num_cyl = Integer::Clamp(num_cyl, 1, data["region", 1]:0 + free_cyl_after); + data["region", 1] = num_cyl; break; case `lvm: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0