Author: snwint Date: Fri Aug 19 17:49:58 2011 New Revision: 65380 URL: http://svn.opensuse.org/viewcvs/yast?rev=65380&view=rev Log: - change raid1 proposal to install only into mbr, not boot - fixing raid1 support Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.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=65380&r1=65379&r2=65380&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 Fri Aug 19 17:49:58 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Aug 19 17:48:21 CEST 2011 - snwint@suse.de + +- change raid1 proposal to install only into mbr, not boot +- 2.17.77 + +------------------------------------------------------------------- +Wed Aug 17 15:01:11 CEST 2011 - snwint@suse.de + +- fixing raid1 support + +------------------------------------------------------------------- Mon Aug 8 15:25:31 CEST 2011 - snwint@suse.de - support md raid1 setups (fate #305008) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp?rev=65380&r1=65379&r2=65380&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/grub/misc.ycp Fri Aug 19 17:49:58 2011 @@ -964,8 +964,12 @@ y2milestone ("Command output: %1", out); } md_mbr = BootCommon::addMDSettingsToGlobals(); - if (md_mbr != "") + if (md_mbr != "") { BootCommon::globals["boot_md_mbr"] = md_mbr; + // don't install into boot partition + BootCommon::globals["boot_boot"] = "false"; + BootCommon::globals["boot_mbr"] = "true"; + } } y2milestone("(2) globals: %1", BootCommon::globals); Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp?rev=65380&r1=65379&r2=65380&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Fri Aug 19 17:49:58 2011 @@ -1408,7 +1408,7 @@ if (!contains(md_physical_disks, p_dev["disk"]:"")) md_physical_disks = add(md_physical_disks,p_dev["disk"]:""); - string no_p = tostring(p_dev["nr"]:""); + string no_p = tostring(p_dev["nr"]:nil); if (no_p == "") { y2error("Wrong number of partition: %1 from Storage::GetDiskPartition: %2", dev, p_dev); Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp?rev=65380&r1=65379&r2=65380&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp Fri Aug 19 17:49:58 2011 @@ -1008,6 +1008,7 @@ // "(hd0,7)/boot/vmlinuz", and are not on the default (currently // mounted) boot partition if ( haskey (s, image_key_name) ) { + y2milestone ("KKKKK 1 s[%1] = %2", image_key_name, s[image_key_name]:""); if ( !regexpmatch(s[image_key_name]:"", "^\(hd.*\)") ) { s = ResolveSymlink(s, image_key_name); } else { @@ -1020,6 +1021,7 @@ // resolve initrd link name, but skip if it is on a non-default boot // partition (see above) if ( haskey (s, "initrd") ) { + y2milestone ("KKKKK 2 s[initrd] = %1", s["initrd"]:""); if ( !regexpmatch(s["initrd"]:"", "^\(hd.*\)") ) { s = ResolveSymlink(s, "initrd"); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org