Author: locilka Date: Thu Nov 1 14:56:53 2007 New Revision: 41703 URL: http://svn.opensuse.org/viewcvs/yast?rev=41703&view=rev Log: - All Bootloader function calls were moved to a separate YCP client restore_bootloader to break the build-dependency on yast2-bootloader. - 2.16.0 Added: trunk/restore/src/restore_bootloader.ycp Modified: trunk/restore/VERSION trunk/restore/package/yast2-restore.changes trunk/restore/src/Restore.ycp trunk/restore/yast2-restore.spec.in Modified: trunk/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/VERSION?rev=41703&r1=41702&r2=41703&view=diff ============================================================================== --- trunk/restore/VERSION (original) +++ trunk/restore/VERSION Thu Nov 1 14:56:53 2007 @@ -1 +1 @@ -2.15.4 +2.16.0 Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.changes?rev=41703&r1=41702&r2=41703&view=diff ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Thu Nov 1 14:56:53 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Nov 1 11:03:06 CET 2007 - locilka@suse.cz + +- All Bootloader function calls were moved to a separate YCP client + restore_bootloader to break the build-dependency on + yast2-bootloader. +- 2.16.0 + +------------------------------------------------------------------- Wed Aug 29 17:29:38 CEST 2007 - locilka@suse.cz - Fixed evaluation of 'nil' value that prevented the restore from Modified: trunk/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/Restore.ycp?rev=41703&r1=41702&r2=41703&view=diff ============================================================================== --- trunk/restore/src/Restore.ycp (original) +++ trunk/restore/src/Restore.ycp Thu Nov 1 14:56:53 2007 @@ -26,7 +26,6 @@ import "Report"; import "Mode"; import "Summary"; - import "Bootloader"; import "Service"; import "Package"; import "Label"; @@ -1257,24 +1256,9 @@ { y2milestone("activating boot loader configuration"); - // read actual boot loader configuration - ret = Bootloader::Read(); - - if (ret == false) - { - y2error("Boot loader read failed"); - } - else - { - // write configuration - force re-installation of boot loader - Bootloader::SetWriteMode( $["save_all" : true] ); - ret = Bootloader::Write(); - - if (ret == false) - { - y2error("Boot loader write failed"); - } - } + // Bootloader function calls were moved to a client + // to break the build-dependency on yast2-bootloader + ret = (boolean) WFM::call ("restore_bootloader"); if (ret == false) { Added: trunk/restore/src/restore_bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/restore_bootloader.ycp?rev=41703&view=auto ============================================================================== --- trunk/restore/src/restore_bootloader.ycp (added) +++ trunk/restore/src/restore_bootloader.ycp Thu Nov 1 14:56:53 2007 @@ -0,0 +1,33 @@ +/** + * File: clients/restore_bootloader.ycp + * Package: Restore module + * Summary: Special client for restoring bootloader settings + * Authors: Ladislav Slezak + * Lukas Ocilka + * + * $Id:$ + * + * All bootloader calls were moved here to break building dependency + * on yast2-bootloader + */ + + +{ + boolean ret = nil; + + ret = Bootloader::Read(); + + if (ret == false) { + y2error("Boot loader read failed"); + } else { + // write configuration - force re-installation of boot loader + Bootloader::SetWriteMode( $["save_all" : true] ); + ret = Bootloader::Write(); + + if (ret == false) { + y2error("Boot loader write failed"); + } + } + + return ret; +} Modified: trunk/restore/yast2-restore.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/yast2-restore.spec.in?rev=41703&r1=41702&r2=41703&view=diff ============================================================================== --- trunk/restore/yast2-restore.spec.in (original) +++ trunk/restore/yast2-restore.spec.in Thu Nov 1 14:56:53 2007 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: yast2-bootloader perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: aaa_base Requires: bzip2 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org