[yast-commit] r60799 - in /trunk/bootloader: package/yast2-bootloader.changes src/modules/BootCommon.ycp src/routines/misc.ycp

Author: juhliarik Date: Thu Feb 11 13:36:14 2010 New Revision: 60799 URL: http://svn.opensuse.org/viewcvs/yast?rev=60799&view=rev Log: added fix for using persisnten device names bnc#533782 Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=60799&r1=60798&r2=60799&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Feb 11 13:36:14 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 11 13:36:28 CET 2010 - juhliarik@suse.cz + +- added fix for using persistent device names (bnc#533782) + +------------------------------------------------------------------- Thu Feb 11 12:13:19 CET 2010 - juhliarik@suse.cz - added fix for using encrypted swap partition (bnc#577127) Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=60799&r1=60798&r2=60799&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Feb 11 13:36:14 2010 @@ -685,6 +685,9 @@ rdev = Storage::SLES9PersistentDevNames(rdev); y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev); } + // bnc#533782 - after changing filesystem label system doesn't boot + if (s["append"]:"" != "") + s["append"] = remapResume(s["append"]:"",true); s["root"] = BootStorage::Dev2MountByDev(rdev); return s; }); Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=60799&r1=60798&r2=60799&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Feb 11 13:36:14 2010 @@ -183,11 +183,13 @@ /** * Function remap "resume" from section (append) to device name (/dev/sda) * or to label (ufo_partition) + * * @param map sections + * @param boolean true if convert resume to persistent device name * @return map sections */ -define string remapResume(string append) +define string remapResume(string append, boolean to_persistent) { if ((search(append, "resume")!=nil) && (search(append, "noresume") == nil)) { @@ -206,7 +208,12 @@ y2debug("value of resume: %1",resume_arg[1]:""); if (dev != "") { - string resume = "resume="+BootStorage::MountByDev2Dev(dev); + string resume =""; + // bnc#533782 - after changing filesystem label system doesn't boot + if (to_persistent) + resume = "resume="+BootStorage::Dev2MountByDev(dev); + else + resume = "resume="+BootStorage::MountByDev2Dev(dev); y2debug("remap resume: %1",resume); new_append = add(new_append, resume); } else { @@ -262,7 +269,7 @@ s["root"] = BootStorage::MountByDev2Dev(rdev); if (s["append"]:"" != "") - s["append"] = remapResume(s["append"]:""); + s["append"] = remapResume(s["append"]:"", false); y2debug("remapping root: %1 from section to: %2 ",rdev ,s["root"]:""); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org