Author: juhliarik Date: Mon Apr 27 17:10:59 2009 New Revision: 57000 URL: http://svn.opensuse.org/viewcvs/yast?rev=57000&view=rev Log: updated changes for new module BootStorage.ycp Modified: trunk/bootloader/src/clients/inst_lilo_convert.ycp trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/grub/options.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/autoinstall.ycp trunk/bootloader/src/routines/i386.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/yast2-bootloader.spec.in Modified: trunk/bootloader/src/clients/inst_lilo_convert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/inst_lilo_convert.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/clients/inst_lilo_convert.ycp (original) +++ trunk/bootloader/src/clients/inst_lilo_convert.ycp Mon Apr 27 17:10:59 2009 @@ -20,6 +20,7 @@ import "BootCommon"; +import "BootStorage"; import "Installation"; import "GetInstArgs"; import "Mode"; @@ -61,11 +62,11 @@ BootCommon::InitializeLibrary(true, "grub"); BootCommon::setLoaderType("grub"); - BootCommon::ProposeDeviceMap (); + BootStorage::ProposeDeviceMap (); BootGRUB::Propose(); - BootCommon::SetDeviceMap(BootCommon::device_mapping); + BootCommon::SetDeviceMap(BootStorage::device_mapping); BootCommon::SetSections(sec); BootCommon::SetGlobal(BootCommon::globals); Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Mon Apr 27 17:10:59 2009 @@ -896,7 +896,7 @@ || (size (BootStorage::device_mapping) == 0) || (BootCommon::cached_settings_base_data_change_time != Storage::GetTargetChangeTime())) { - BootCommon::ProposeDeviceMap(); + BootStorage::ProposeDeviceMap(); } if ( ! Mode::autoinst () ) { Modified: trunk/bootloader/src/grub/options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/options.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/grub/options.ycp (original) +++ trunk/bootloader/src/grub/options.ycp Mon Apr 27 17:10:59 2009 @@ -19,6 +19,7 @@ textdomain "bootloader"; import "Label"; +import "BootStorage"; import "System::Bootloader_API"; include "bootloader/routines/common_options.ycp"; @@ -299,7 +300,7 @@ void InitDiskOrder(string widget) { - list<string> disksOrder = BootCommon::DisksOrder (); + list<string> disksOrder = BootStorage::DisksOrder (); UI::ChangeWidget ( `id(`disks), `Items, disksOrder); UI::ChangeWidget (`id (`disks), `CurrentItem, disksOrder[0]:""); Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Mon Apr 27 17:10:59 2009 @@ -494,7 +494,7 @@ if (BootStorage::device_mapping == nil || size (BootStorage::device_mapping) == 0) { - BootCommon::ProposeDeviceMap (); + BootStorage::ProposeDeviceMap (); } //importMetaData(); Modified: trunk/bootloader/src/routines/autoinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/autoinstall.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/routines/autoinstall.ycp (original) +++ trunk/bootloader/src/routines/autoinstall.ycp Mon Apr 27 17:10:59 2009 @@ -103,6 +103,7 @@ // ------------------------------------------------- import "Bootloader"; + import "BootStorage"; import "BootCommon"; import "Initrd"; import "Kernel"; @@ -395,7 +396,7 @@ }); string file = mergestring (lines, "\n"); BootCommon::InitializeLibrary (true, loader); - BootCommon::SetDeviceMap (BootCommon::device_mapping); + BootCommon::SetDeviceMap (BootStorage::device_mapping); BootCommon::SetSections ([]); BootCommon::SetGlobal ($[]); map<string,string> files = BootCommon::GetFilesContents (); Modified: trunk/bootloader/src/routines/i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/i386.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/routines/i386.ycp (original) +++ trunk/bootloader/src/routines/i386.ycp Mon Apr 27 17:10:59 2009 @@ -169,7 +169,7 @@ || size (BootStorage::device_mapping) == 0) && (getLoaderType(false) == "grub")) { - ProposeDeviceMap (); + BootStorage::ProposeDeviceMap (); } if (DisksChanged () && ! Mode::autoinst ()) { Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Mon Apr 27 17:10:59 2009 @@ -27,9 +27,7 @@ import "Map"; global string DiskOrderSummary (); -global list<string> DisksOrder (); global void DetectDisks (); -global void ProposeDeviceMap (); global boolean DisksChanged (); include "bootloader/routines/i386.ycp"; @@ -73,7 +71,7 @@ */ global string FindMBRDisk() { // check the disks order, first has MBR - list<string> order = DisksOrder (); + list<string> order = BootStorage::DisksOrder (); if (size (order) > 0) { string ret = order[0]:""; @@ -1080,7 +1078,7 @@ * @return string a line for the summary (or nil if not intended to be shown) */ global string DiskOrderSummary () { - list<string> order = DisksOrder (); + list<string> order = BootStorage::DisksOrder (); string ret = nil; if (size (order) > 1) { Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Mon Apr 27 17:10:59 2009 @@ -404,7 +404,7 @@ // examineMBR returns "* stage1" when it finds the signature // of some stage1 bootloader string result = examineMBR(device); - if ((search(result, "grub") != nil) || (search(result, "lilo") != nil)) + if ((result == "grub") || (result == "lilo")) return true; else return false; Modified: trunk/bootloader/yast2-bootloader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec.in?rev=57000&r1=56999&r2=57000&view=diff ============================================================================== --- trunk/bootloader/yast2-bootloader.spec.in (original) +++ trunk/bootloader/yast2-bootloader.spec.in Mon Apr 27 17:10:59 2009 @@ -10,7 +10,7 @@ Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 Requires: perl-Bootloader >= 0.5.0 -Requires: yast2-core >= 2.18.6 +Requires: yast2-core >= 2.18.7 Requires: yast2-storage parted perl-Compress-Zlib limal-perl BuildRequires: yast2 >= 2.18.14 BuildRequires: yast2-packager >= 2.17.24 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org