Author: juhliarik Date: Mon Nov 23 16:51:00 2009 New Revision: 59719 URL: http://svn.opensuse.org/viewcvs/yast?rev=59719&view=rev Log: added fix for persistent device names on PPC Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=59719&r1=59718&r2=59719&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Nov 23 16:51:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 23 16:50:57 CET 2009 - juhliarik@suse.cz + +- added fix for converting device name to persistent device name + for ppc (bnc#510086) + +------------------------------------------------------------------- Mon Nov 23 16:38:57 CET 2009 - juhliarik@suse.cz - added support for installing an booting MD RAID from Intel Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp?rev=59719&r1=59718&r2=59719&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp Mon Nov 23 16:51:00 2009 @@ -18,6 +18,7 @@ import "Storage"; import "Mode"; import "BootSupportCheck"; + import "Popup"; include "bootloader/routines/wizards.ycp"; Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp?rev=59719&r1=59718&r2=59719&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Mon Nov 23 16:51:00 2009 @@ -628,16 +628,7 @@ global define string Dev2MountByDev(string dev) { y2milestone ("Dev2MountByDev: %1", dev); - - // (`id,`uuid,`path,`device,`label) symbol by_mount = nil; - if (Arch::ppc()) - by_mount = `id; - else - by_mount = Storage::GetDefaultMountBy(); - - //by_mount = `id; - y2milestone("Default mount by is %1", by_mount); // add all_partitions to partitions if (MapAllPartitions()) @@ -648,6 +639,37 @@ map partition = $[]; map device = $[]; string ret = dev; + + // bnc#510086 mountby-Option "device" from the AutoYast partitioning profile + // isnt correctly populating lilo.conf + // (`id,`uuid,`path,`device,`label) + // bnc#458018 accept different mount-by for partition + // created by user + by_mount = Storage::GetDefaultMountBy(); + //by_mount = `id; + y2milestone("Default mount by is %1", by_mount); + + if (haskey(partitions, dev)) + { + symbol partition_mount_by = (symbol) partitions[dev, "mountby"]:nil; + if ((partition_mount_by != nil)) + by_mount = partition_mount_by; + } + + if (by_mount == `device) + { + y2milestone("Skip converting device: %1 to persistent device names because mountby is set to: %2", + dev, by_mount); + return dev; + } + + if (Arch::ppc()) + { + by_mount = `id; + y2milestone("Adding default mount-by for ppc (`id)"); + } + + switch(by_mount) { // convert to udev_id -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org