Author: pth Date: Mon Aug 20 19:10:08 2007 New Revision: 40371 URL: http://svn.opensuse.org/viewcvs/yast?rev=40371&view=rev Log: - Import BootCommon in bootloader_finish - Remove unneeded test code. - Add dummy FlagOnetimeBoot versions where needed. Modified: trunk/bootloader/src/clients/bootloader_finish.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/modules/BootZIPL.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_finish.ycp?rev=40371&r1=40370&r2=40371&view=diff ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Mon Aug 20 19:10:08 2007 @@ -23,6 +23,7 @@ import "Misc"; import "Mode"; import "Update"; +import "BootCommon"; any ret = nil; string func = ""; @@ -165,7 +166,7 @@ string default_name = BootCommon::globals["default"]:""; - return Bootloader::FlagOnetimeBoot (default_name) + return Bootloader::FlagOnetimeBoot (default_name); } else { Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO.ycp?rev=40371&r1=40370&r2=40371&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Mon Aug 20 19:10:08 2007 @@ -605,11 +605,6 @@ ]; } -global define boolean Bootonce (string name) -{ - return true -} - /** * Initializer of ELILO bootloader */ Modified: trunk/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootLILO.ycp?rev=40371&r1=40370&r2=40371&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootLILO.ycp (original) +++ trunk/bootloader/src/modules/BootLILO.ycp Mon Aug 20 19:10:08 2007 @@ -282,6 +282,18 @@ ]; } +/** + * Set section to boot on next reboot + * @param section string section to boot + * @return boolean true on success + */ +global define boolean FlagOnetimeBoot (string section) +{ + map result = (map)SCR::Execute (.target.bash_output, + sformat ("/sbin/lilo -R \"%1\"", section)); + y2milestone ("lilo returned %1", result); + return (result["exit"]:-1 == 0); +} /** * Return map of provided functions @@ -300,15 +312,6 @@ } /** - * Boot once to passed title - */ -global define boolean Bootonce (string name) -{ - y2milestone (sformat ("Calling lilo -R for %1",l name)) - /* return SCR::Execute (.target.bash, sformat ("/sbin/lilo -R %1", name)) */ -} - -/** * Initializer of LILO bootloader */ global void Initializer () { Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWERLILO.ycp?rev=40371&r1=40370&r2=40371&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Mon Aug 20 19:10:08 2007 @@ -1206,11 +1206,6 @@ ]; } -global define boolean Bootonce (string name) -{ - return true -} - /** * Initializer of PowerLILO bootloader */ Modified: trunk/bootloader/src/modules/BootZIPL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootZIPL.ycp?rev=40371&r1=40370&r2=40371&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootZIPL.ycp (original) +++ trunk/bootloader/src/modules/BootZIPL.ycp Mon Aug 20 19:10:08 2007 @@ -317,11 +317,6 @@ ]; } -global define boolean Bootonce (string name) -{ - return true -} - /** * Initializer of S390 bootloader */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org