[yast-commit] r48552 - in /trunk/bootloader/src: modules/BootCommon.ycp routines/dialogs.ycp routines/lilolike.ycp

Author: juhliarik Date: Thu Jun 26 17:23:51 2008 New Revision: 48552 URL: http://svn.opensuse.org/viewcvs/yast?rev=48552&view=rev Log: deleted support xenpae... M bootloader/src/modules/BootCommon.ycp M bootloader/src/routines/lilolike.ycp M bootloader/src/routines/dialogs.ycp Modified: trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/dialogs.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=48552&r1=48551&r2=48552&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Jun 26 17:23:51 2008 @@ -598,15 +598,12 @@ { ret["type"] = "xen"; ret["xen_append"] = ""; - if (UsingXenPae()) { - ret["xen"] = "/boot/xen-pae.gz"; - ret["image"] = "/boot/" + Kernel::GetBinary () + "-xenpae"; - ret["initrd"] = "/boot/initrd-xenpae"; - } else { - ret["xen"] = "/boot/xen.gz"; - ret["image"] = "/boot/" + Kernel::GetBinary () + "-xen"; - ret["initrd"] = "/boot/initrd-xen"; - } + + // bug #400526 there is not xenpae anymore... + ret["xen"] = "/boot/xen.gz"; + ret["image"] = "/boot/" + Kernel::GetBinary () + "-xen"; + ret["initrd"] = "/boot/initrd-xen"; + } else if (title == "wildcard") { Modified: trunk/bootloader/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs.ycp?rev=48552&r1=48551&r2=48552&view=diff ============================================================================== --- trunk/bootloader/src/routines/dialogs.ycp (original) +++ trunk/bootloader/src/routines/dialogs.ycp Thu Jun 26 17:23:51 2008 @@ -301,7 +301,8 @@ { BootCommon::current_section = (map)union ( $[ - "xen" : BootCommon::UsingXenPae() ? "/boot/xen-pae.gz" : "/boot/xen.gz", + // bug #400526 there is not xenpae anymore... + "xen" : "/boot/xen.gz", "xen_append" : "", ], BootCommon::current_section); Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=48552&r1=48551&r2=48552&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Jun 26 17:23:51 2008 @@ -441,8 +441,9 @@ * order is from special to general, but prefer "default" in favor of "xen" */ // FIXME: handle "rt" and "vanilla"? +// bnc #400526 there is not xenpae anymore... list<string> generic_fallback_flavors = [ - "s390", "iseries64", "ppc64", "bigsmp", "default", "xenpae", "xen", + "s390", "iseries64", "ppc64", "bigsmp", "default", "xen", ]; /** @@ -1138,10 +1139,8 @@ } else if (type == "xen" && write_settings["insert_initrd"]:false) { - if (BootCommon::UsingXenPae()) - s["initrd"] = "/boot/initrd-xenpae"; - else - s["initrd"] = "/boot/initrd-xen"; + // bnc #400526 there is not xenpae any more... + s["initrd"] = "/boot/initrd-xen"; } if (initrd != "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org