Author: juhliarik Date: Tue Apr 13 17:04:29 2010 New Revision: 61692 URL: http://svn.opensuse.org/viewcvs/yast?rev=61692&view=rev Log: added fix for using uuid names bnc#594482 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootStorage.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=61692&r1=61691&r2=61692&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Apr 13 17:04:29 2010 @@ -1 +1 @@ -2.19.11 +2.19.12 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=61692&r1=61691&r2=61692&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Apr 13 17:04:29 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 13 14:15:33 CEST 2010 - juhliarik@suse.cz + +- added fix for troubles with using uuid names (bnc#594482) +- 2.19.12 + +------------------------------------------------------------------- Thu Apr 8 15:55:40 CEST 2010 - juhliarik@suse.cz - added patch for enable/disable SELinux (fate#309275) Modified: trunk/bootloader/src/modules/BootStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootStorage.ycp?rev=61692&r1=61691&r2=61692&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootStorage.ycp (original) +++ trunk/bootloader/src/modules/BootStorage.ycp Tue Apr 13 17:04:29 2010 @@ -81,6 +81,32 @@ global map multipath_mapping = $[]; +// FIXME: it is ugly hack because y2-storage doesn't known +// to indicate that it finish (create partitions) proposed partitioning of disk in installation +/** bnc#594482 - grub config not using uuid + * Indicate if storage already finish partitioning of disk + * if some partition includes any keyword "create" + * the value is the first found partition with flag "create" e.g. /dev/sda2 + * empty string means all partitions are created + */ +string proposed_partition = ""; + +/** bnc#594482 - grub config not using uuid + * 0 - if all devices in variable all_devices are created. + * 1 - if partition with flag "create" was found in MapDevices() + * 2 - if proposed_partition was created or flag "create" was deleted + * by y2-storage. the value is set in CheckProposedPartition () + */ +integer all_devices_created = 0; + +/** bnc#594482 - grub config not using uuid + * 0 - if all devices in variable all_partitions and all_disks are created + * 1 - if partition with flag "create" was found in MapDevices() + * 2 - if proposed_partition was created or flag "create" was deleted + * by y2-storage. the value is set in CheckProposedPartition () + */ +integer all_partitions_created = 0; + /** * mountpoints for perl-Bootloader */ @@ -182,6 +208,14 @@ foreach (map p, (list<map>)(v["partitions"]:[]), { + // bnc#594482 - grub config not using uuid + // if there is "not created" partition and flag for "it" is not set + if ((p["create"]:nil == true) && (Mode::installation())) + { + if (proposed_partition == "") + proposed_partition = p["device"]:""; + all_devices_created = 1; + } // map partition by uuid if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) { @@ -218,7 +252,11 @@ }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), }); // end of foreach (string k, map v, devices, - + if (Mode::installation() && all_devices_created == 2) + { + all_devices_created = 0; + y2milestone("set status for all_devices to \"created\""); + } y2debug("device name mapping to kernel names: %1", all_devices); } @@ -253,9 +291,69 @@ return ret; } +/** bnc#594482 - grub config not using uuid + * Function check if proposed_partition still includes + * flag "create" + * + * @param map tm + * @return true if partition is still not created + */ +boolean CheckProposedPartition (map tm) +{ + boolean ret = true; + if (!Mode::installation()) + { + y2debug("Skip CheckProposedPartition() -> it is not running installation"); + return false; + } + if (size(tm) == 0 || proposed_partition == "") + { + y2debug("proposed_partition is empty: %1", proposed_partition); + return false; + } + map dp = Storage::GetDiskPartition (proposed_partition); + string disk = dp["disk"]:""; + list <map> partitions = (list<map>)tm[disk,"partitions"]:[]; + foreach (map p, partitions, + { + if (p["device"]:"" == proposed_partition) + { + if (p["create"]:nil != true) + { + proposed_partition = ""; + y2milestone("proposed_partition is already created: %1", p); + if (all_devices_created == 1) + all_devices_created = 2; + if (all_partitions_created == 1) + all_partitions_created = 2; + ret = false; + } else { + y2milestone("proposed_partition: %1 is NOT created", proposed_partition); + } + break; + } + }); + return ret; +} +/** bnc#594482 - grub config not using uuid + * Check if it is necessary rebuild all_devices + * + * @return true -> rebuild all_devices + */ + +boolean RebuildMapDevices() +{ + boolean ret = false; + boolean ret_CheckProposedPartition = CheckProposedPartition((map)Storage::GetTargetMap()); + + if (!ret_CheckProposedPartition && all_devices_created == 2) + return true; + + return ret; +} /** * Init and fullfil internal data for perl-Bootloader @@ -266,7 +364,7 @@ global boolean InitMapDevices () { boolean ret = false; - if (disk_change_time_InitBootloader != Storage::GetTargetChangeTime()) + if (disk_change_time_InitBootloader != Storage::GetTargetChangeTime() || RebuildMapDevices()) { y2milestone("Init internal data from storage"); MapDevices(); @@ -277,7 +375,22 @@ return ret; } +/** bnc#594482 - grub config not using uuid + * Check if it is necessary rebuild all_partitions and all_disks + * + * @return true -> rebuild all_partitions and all_disks + */ +boolean RebuilMapAllPartitions() +{ + boolean ret = false; + boolean ret_CheckProposedPartition = CheckProposedPartition((map)Storage::GetTargetMap()); + + if (!ret_CheckProposedPartition && all_partitions_created == 2) + return true; + + return ret; +} /** * bnc #468922 - problem with longtime running the parsing a huge number of disks @@ -290,7 +403,8 @@ { boolean ret = false; if ((disk_change_time_MapAllPartitions != Storage::GetTargetChangeTime()) - || (size(all_partitions) < 1) || (size(target_map) < 1)) + || (size(all_partitions) < 1) || (size(target_map) < 1) + || RebuilMapAllPartitions()) { // save last change time from storage for MapAllPartitions() disk_change_time_MapAllPartitions = Storage::GetTargetChangeTime(); @@ -304,11 +418,24 @@ { foreach (map p, (list<map>)(v["partitions"]:[]), { + // bnc#594482 - grub config not using uuid + // if there is "not created" partition and flag for "it" is not set + if ((p["create"]:nil == true) && (Mode::installation())) + { + if (proposed_partition == "") + proposed_partition = p["device"]:""; + all_partitions_created = 1; + } all_partitions[p["device"]:""] = p; }); }); ret = true; } + if (Mode::installation() && all_partitions_created == 2) + { + all_partitions_created = 0; + y2milestone("set status for all_partitions to \"created\""); + } return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org