Author: odabrunz Date: Thu Oct 11 14:55:01 2007 New Revision: 41373 URL: http://svn.opensuse.org/viewcvs/yast?rev=41373&view=rev Log: - migrate SLES9 persistent device ("...p1") names to SLES10 persistent device names ("...-part1") (#162216) - add author where missing Modified: trunk/bootloader/src/clients/bootloader_finish.ycp trunk/bootloader/src/elilo/helps.ycp trunk/bootloader/src/generic/dialogs.ycp trunk/bootloader/src/modules/BootArch.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/autoinstall.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/popups.ycp trunk/bootloader/src/routines/section_widgets.ycp trunk/bootloader/src/routines/switcher.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader... ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Thu Oct 11 14:55:01 2007 @@ -7,6 +7,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/elilo/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/elilo/helps.ycp?re... ============================================================================== --- trunk/bootloader/src/elilo/helps.ycp (original) +++ trunk/bootloader/src/elilo/helps.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Joachim Plack <jplack@suse.de> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/generic/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/dialogs.yc... ============================================================================== --- trunk/bootloader/src/generic/dialogs.ycp (original) +++ trunk/bootloader/src/generic/dialogs.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Joachim Plack <jplack@suse.de> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.y... ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Thu Oct 11 14:55:01 2007 @@ -12,6 +12,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon... ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Oct 11 14:55:01 2007 @@ -637,8 +637,15 @@ }); // convert device names in device map to the kernel device names - device_mapping = - mapmap (string k , string v, device_mapping, { + device_mapping = mapmap (string k , string v, device_mapping, { + // if we update from version 9 (SLES9), first convert old-style persistent + // device names to new-style persistent device names ("p1" -> "-part1") + // NOTE: this is idempotent; but other device name translation + // (e.g. libata migration) is not, so it will be done later + if (Mode::update () && installed_version["major"]:0 == 9) { + k = Storage::SLES9PersistentDevNames(k); + y2milestone( "devmap: dev name after SLES9 persistent dev name translation: %1", k); + } return $[BootCommon::MountByDev2Dev(k) : v]; }); @@ -646,16 +653,28 @@ // also, for legacy bootloaders like LILO that still pass device names, // convert the stage1_dev globals = mapmap (string k , string v, globals, { - if ( k == "stage1_dev" || regexpmatch(k, "^boot_.*custom$" ) ) + if ( k == "stage1_dev" || regexpmatch(k, "^boot_.*custom$" ) ) { + // see comments above + if (Mode::update () && installed_version["major"]:0 == 9) { + v = Storage::SLES9PersistentDevNames(v); + y2milestone( "globals: dev name after SLES9 persistent dev name translation: %1", v); + } return $[k : BootCommon::MountByDev2Dev(v)]; - else + } else { return $[k : v]; + } }); // convert root device names in sections to kernel device names, if // possible sections = maplist (map<string,any> s, sections, { - s["root"] = BootCommon::MountByDev2Dev(s["root"]:""); + string rdev = s["root"]:""; + // see comments above + if (Mode::update () && installed_version["major"]:0 == 9) { + rdev = Storage::SLES9PersistentDevNames(rdev); + y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev); + } + s["root"] = BootCommon::MountByDev2Dev(rdev); return s; }); Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO.... ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Thu Oct 11 14:55:01 2007 @@ -14,6 +14,7 @@ * Joachim Plack <jplack@suse.de> * Jiri Srain <jsrain@suse.cz> * Andreas Schwab <schwab@suse.de> + * Olaf Dabrunz <od@suse.de> * Philipp Thomas <pth@suse.de> * * $Id$ Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.y... ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Thu Oct 11 14:55:01 2007 @@ -12,6 +12,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * Joachim Plack <jplack@suse.de> + * Olaf Dabrunz <od@suse.de> * Philipp Thomas <pth@suse.de> * * $Id$ Modified: trunk/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootLILO.y... ============================================================================== --- trunk/bootloader/src/modules/BootLILO.ycp (original) +++ trunk/bootloader/src/modules/BootLILO.ycp Thu Oct 11 14:55:01 2007 @@ -11,6 +11,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * Philipp Thomas <pth@suse.de> * * $Id$ Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader... ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/autoinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/autoinsta... ============================================================================== --- trunk/bootloader/src/routines/autoinstall.ycp (original) +++ trunk/bootloader/src/routines/autoinstall.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.... ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/popups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/popups.yc... ============================================================================== --- trunk/bootloader/src/routines/popups.ycp (original) +++ trunk/bootloader/src/routines/popups.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_w... ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * Modified: trunk/bootloader/src/routines/switcher.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/switcher.... ============================================================================== --- trunk/bootloader/src/routines/switcher.ycp (original) +++ trunk/bootloader/src/routines/switcher.ycp Thu Oct 11 14:55:01 2007 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Olaf Dabrunz <od@suse.de> * * $Id$ * -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org