Author: jreidinger Date: Thu Apr 2 10:21:45 2009 New Revision: 56561 URL: http://svn.opensuse.org/viewcvs/yast?rev=56561&view=rev Log: remove testing hack before merge Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp?rev=56561&r1=56560&r2=56561&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp Thu Apr 2 10:21:45 2009 @@ -1231,10 +1231,10 @@ // it should be split and designed for each module (bootloader) if ((bootloader == "grub") || (bootloader == "lilo") || (bootloader == "elilo")) bootloader_packages = add(bootloader_packages, bootloader); - //else if (bootloader == "ppc") - // bootloader_packages = add(bootloader_packages, "lilo"); - //else if (bootloader == "zipl") XXX TESTING!!!XXX - // bootloader_packages = add(bootloader_packages, "s390-tools"); + else if (bootloader == "ppc") + bootloader_packages = add(bootloader_packages, "lilo"); + else if (bootloader == "zipl") + bootloader_packages = add(bootloader_packages, "s390-tools"); // don't configure package manager during autoinstallation preparing if (Mode::normal () && (! (Mode::config () || Mode::repair ()))) @@ -1282,7 +1282,7 @@ ]; if (Arch::i386 () || Arch::x86_64 ()) { - ret = (list<string>)merge (ret, ["lilo", "grub","zipl", "ppc"]); //XXX debuging zipl XXX + ret = (list<string>)merge (ret, ["lilo", "grub"]); if (Arch::x86_64 ()) ret = (list<string>)merge (ret, ["elilo"]); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org