Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Mon Oct 13 17:11:00 CEST 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-10-08 10:54:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-10-13 17:06:56.000000000 +0200
@@ -1,0 +2,22 @@
+Mon Oct 13 16:40:11 CEST 2008 - juhliarik@suse.cz
+
+- added fix for translation labes for ELILO (bnc #151486)
+- added fix for typo in help text (bnc #433424)
+- added fix for problem with device names in live CD installation
+ (bnc #432699)
+- 2.17.27
+
+-------------------------------------------------------------------
+Fri Oct 10 14:50:31 CEST 2008 - jsrain@suse.cz
+
+- fixed bootloader proposal in mixed standalone disk and BIOS-RAID
+ environments (bnc #433092)
+- issue a warning if /boot directory is on XFS on x86 boot
+ architecture (bnc #429042)
+
+-------------------------------------------------------------------
+Wed Oct 8 15:32:09 CEST 2008 - juhliarik@suse.cz
+
+- added fix for handling nil from function InitializeBootloader()
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.26.tar.bz2
New:
----
yast2-bootloader-2.17.27.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.AF5713/_old 2008-10-13 17:10:47.000000000 +0200
+++ /var/tmp/diff_new_pack.AF5713/_new 2008-10-13 17:10:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.26)
+# spec file for package yast2-bootloader (Version 2.17.27)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.26
+Version: 2.17.27
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.26.tar.bz2
+Source0: yast2-bootloader-2.17.27.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
@@ -61,7 +61,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.26
+%setup -n yast2-bootloader-2.17.27
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,6 +107,19 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Mon Oct 13 2008 juhliarik@suse.cz
+- added fix for translation labes for ELILO (bnc #151486)
+- added fix for typo in help text (bnc #433424)
+- added fix for problem with device names in live CD installation
+ (bnc #432699)
+- 2.17.27
+* Fri Oct 10 2008 jsrain@suse.cz
+- fixed bootloader proposal in mixed standalone disk and BIOS-RAID
+ environments (bnc #433092)
+- issue a warning if /boot directory is on XFS on x86 boot
+ architecture (bnc #429042)
+* Wed Oct 08 2008 juhliarik@suse.cz
+- added fix for handling nil from function InitializeBootloader()
* Wed Oct 08 2008 juhliarik@suse.cz
- added fix for adding crashkernel from y2-kdump (bnc #432651)
- added fix for writing proposal (bnc #433344)
++++++ yast2-bootloader-2.17.26.tar.bz2 -> yast2-bootloader-2.17.27.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/grub/helps.ycp new/yast2-bootloader-2.17.27/src/grub/helps.ycp
--- old/yast2-bootloader-2.17.26/src/grub/helps.ycp 2008-09-18 17:07:15.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/grub/helps.ycp 2008-10-10 14:18:46.000000000 +0200
@@ -47,7 +47,7 @@
_("<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is
<b>Boot from Root Partition</b>.</p>"),
"trusted_grub" :
-_("<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Grafical Menu File</i> will be ignored.
+_("<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.
It is recommended to install grub to MBR</p>"),
"boot_mbr" :
_("<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/modules/BootELILO.ycp new/yast2-bootloader-2.17.27/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.17.26/src/modules/BootELILO.ycp 2008-10-08 10:38:54.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/modules/BootELILO.ycp 2008-10-13 17:01:00.000000000 +0200
@@ -17,7 +17,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootELILO.ycp 51956 2008-10-08 08:38:52Z juhliarik $
+ * $Id: BootELILO.ycp 52151 2008-10-13 15:00:57Z juhliarik $
*
*/
@@ -132,6 +132,10 @@
map section =
BootCommon::CreateLinuxSection (title);
+ // don't translate label bnc #151486
+ section["description"] = section["name"]:"";
+ section["name"] = title;
+
// replace "kernel" by "image"
if (haskey(section, "kernel")) {
section["image"] = section["kernel"]:"";
@@ -150,13 +154,14 @@
global void CreateSections () {
map linux = CreateLinuxSection ("linux");
map failsafe = CreateLinuxSection ("failsafe");
+ map xen = CreateLinuxSection ("xen");
// append for default section is in global
// FIXME do it later
// if (haskey (linux, "append"))
// linux = remove (linux, "append");
- BootCommon::sections = [ linux, failsafe ];
+ BootCommon::sections = [ linux, failsafe, xen ];
}
@@ -168,7 +173,8 @@
BootCommon::globals = $[
// FIXME do it later
// "append" : BootArch::DefaultKernelParams (""),
- "default" : BootCommon::translateSectionTitle ("linux"),
+ // "default" : BootCommon::translateSectionTitle ("linux"),
+ "default" : "linux",
"timeout" : "80",
"prompt" : "true",
"read-only" : "true",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/modules/BootGRUB.ycp new/yast2-bootloader-2.17.27/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.17.26/src/modules/BootGRUB.ycp 2008-10-08 10:38:54.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/modules/BootGRUB.ycp 2008-10-08 15:30:26.000000000 +0200
@@ -15,7 +15,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootGRUB.ycp 51956 2008-10-08 08:38:52Z juhliarik $
+ * $Id: BootGRUB.ycp 51990 2008-10-08 13:30:24Z juhliarik $
*
*/
@@ -741,6 +741,9 @@
}
boolean grub_ret = BootCommon::InitializeBootloader ();
+ if (grub_ret == nil)
+ grub_ret = false;
+
y2milestone ("GRUB return value: %1", grub_ret);
if (BootCommon::InstallingToFloppy ()) {
BootCommon::updateTimeoutPopupForFloppy
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/modules/BootLILO.ycp new/yast2-bootloader-2.17.27/src/modules/BootLILO.ycp
--- old/yast2-bootloader-2.17.26/src/modules/BootLILO.ycp 2008-10-08 10:38:54.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/modules/BootLILO.ycp 2008-10-08 15:30:26.000000000 +0200
@@ -14,7 +14,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootLILO.ycp 51956 2008-10-08 08:38:52Z juhliarik $
+ * $Id: BootLILO.ycp 51990 2008-10-08 13:30:24Z juhliarik $
*
*/
@@ -289,6 +289,8 @@
}
ret = ret && BootCommon::InitializeBootloader ();
+ if (ret == nil)
+ ret = false;
ret = ret && BootCommon::PostUpdateMBR ();
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.27/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.17.26/src/modules/Bootloader.ycp 2008-10-08 10:38:54.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/modules/Bootloader.ycp 2008-10-13 17:01:00.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 51956 2008-10-08 08:38:52Z juhliarik $
+ * $Id: Bootloader.ycp 52151 2008-10-13 15:00:57Z juhliarik $
*
*/
@@ -788,9 +788,15 @@
BootCommon::sections=filter(map section, BootCommon::sections,
{
- if (((section["name"]:nil == linux_default["name"]:nil) && (num_linux_default > 1))
- ||((section["name"]:nil == linux_failsafe["name"]:nil) && (num_linux_failsafe > 1))
- ||((section["name"]:nil == linux_xen["name"]:nil) && (num_linux_xen > 1)))
+ if ((((section["name"]:nil == linux_default["name"]:nil)
+ ||(section["description"]:"" == linux_default["name"]:nil))
+ && (num_linux_default > 1))
+ ||(((section["name"]:nil == linux_failsafe["name"]:nil)
+ ||(section["description"]:"" ==linux_failsafe["name"]:nil))
+ && (num_linux_failsafe > 1))
+ ||(((section["name"]:nil == linux_xen["name"]:nil)
+ ||(section["description"]:"" == linux_xen["name"]:nil))
+ && (num_linux_xen > 1)))
{
if ((section["root"]:nil == linux_default["root"]:nil)
||(section["root"]:nil == linux_failsafe["root"]:nil)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.17.27/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.17.26/src/modules/BootPOWERLILO.ycp 2008-10-08 10:38:54.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/modules/BootPOWERLILO.ycp 2008-10-08 15:30:26.000000000 +0200
@@ -16,7 +16,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootPOWERLILO.ycp 51956 2008-10-08 08:38:52Z juhliarik $
+ * $Id: BootPOWERLILO.ycp 51990 2008-10-08 13:30:24Z juhliarik $
*
*/
@@ -1149,6 +1149,8 @@
boolean ret = BootCommon::UpdateBootloader ();
ret = ret && BootCommon::InitializeBootloader ();
+ if (ret == nil)
+ ret = false;
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/modules/BootSupportCheck.ycp new/yast2-bootloader-2.17.27/src/modules/BootSupportCheck.ycp
--- old/yast2-bootloader-2.17.26/src/modules/BootSupportCheck.ycp 2008-10-07 18:37:35.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/modules/BootSupportCheck.ycp 2008-10-13 16:57:05.000000000 +0200
@@ -145,7 +145,7 @@
*/
-boolean check_BootDevice()
+global boolean check_BootDevice()
{
boolean result = true;
string boot_device = "";
@@ -178,13 +178,38 @@
found_boot = true;
y2milestone("The boot device: %1 is not on raid0", boot_device);
break;
- }
+ }
}
});
if ((!result) || (found_boot))
break;
});
}
+ // check if /boot directory is on supported filesystem
+ boolean boot_dir_result = true;
+ found_boot = false;
+ foreach (string k, map v, devices, {
+ foreach (map p, (list<map>)(v["partitions"]:[]), {
+ if (p["device"]:"" == BootCommon::BootPartitionDevice)
+ {
+ if (p["used_fs"]:nil == `xfs) {
+ AddNewProblem (_("The /boot directory is on an XFS filesystem"));
+ y2error ("The /boot directory is on an XFS filesystem");
+ boot_dir_result = false;
+ break;
+ }
+ else
+ {
+ found_boot = true;
+ y2milestone ("/boot filesystem is OK");
+ break;
+ }
+ }
+ });
+ if ((!boot_dir_result) || (found_boot))
+ break;
+ });
+ result = result && boot_dir_result;
return result;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/modules/BootZIPL.ycp new/yast2-bootloader-2.17.27/src/modules/BootZIPL.ycp
--- old/yast2-bootloader-2.17.26/src/modules/BootZIPL.ycp 2008-07-21 16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/modules/BootZIPL.ycp 2008-10-08 15:30:26.000000000 +0200
@@ -14,7 +14,7 @@
* Jiri Srain
* Philipp Thomas
*
- * $Id: BootZIPL.ycp 41120 2007-09-26 19:17:08Z odabrunz $
+ * $Id: BootZIPL.ycp 51990 2008-10-08 13:30:24Z juhliarik $
*
*/
@@ -270,6 +270,8 @@
global define boolean Write () {
boolean ret = BootCommon::UpdateBootloader ();
ret = ret && BootCommon::InitializeBootloader ();
+ if (ret == nil)
+ ret = false;
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/routines/global_widgets.ycp new/yast2-bootloader-2.17.27/src/routines/global_widgets.ycp
--- old/yast2-bootloader-2.17.26/src/routines/global_widgets.ycp 2008-09-12 14:21:26.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/routines/global_widgets.ycp 2008-10-08 15:30:26.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: global_widgets.ycp 51099 2008-09-12 12:21:26Z juhliarik $
+ * $Id: global_widgets.ycp 51990 2008-10-08 13:30:24Z juhliarik $
*
*/
@@ -33,6 +33,7 @@
import "Message";
+
include "bootloader/routines/helps.ycp";
/**
@@ -862,7 +863,13 @@
else if (op == `init)
{
// Bootloader::blSave (false, false, false);
- BootCommon::InitializeBootloader ();
+ boolean ret = BootCommon::InitializeBootloader ();
+ if (ret == nil)
+ ret = false;
+
+ if (!ret)
+ Popup::Warning(_("Writing bootloader settings failed."));
+
}
else if (op == `propose_deep)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/routines/lib_iface.ycp new/yast2-bootloader-2.17.27/src/routines/lib_iface.ycp
--- old/yast2-bootloader-2.17.26/src/routines/lib_iface.ycp 2008-10-08 10:38:54.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/routines/lib_iface.ycp 2008-10-13 17:01:00.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: lib_iface.ycp 51956 2008-10-08 08:38:52Z juhliarik $
+ * $Id: lib_iface.ycp 52151 2008-10-13 15:00:57Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only
@@ -119,6 +119,23 @@
});
list<list> partinfo = flatten (pi);
partinfo = filter (list p, partinfo, {return p != nil && p != [];});
+ list<list> partinfo_mountby = [];
+ // adding moundby (by-id) via user preference
+ foreach(list partition, partinfo, {
+ list tmp =[];
+ string mount_by = BootCommon::Dev2MountByDev(tostring(partition[0]:""));
+ if (mount_by != tostring(partition[0]:""))
+ {
+ tmp = add(partition, mount_by);
+ } else {
+ tmp = partition;
+ }
+ partinfo_mountby = add(partinfo_mountby, tmp);
+ });
+ // y2milestone("added mountby: %1", partinfo_mountby);
+
+ partinfo = partinfo_mountby;
+
y2milestone ("Information about partitioning: %1", partinfo);
y2milestone ("Information about MD arrays: %1", md_info);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/src/routines/lilolike.ycp new/yast2-bootloader-2.17.27/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.17.26/src/routines/lilolike.ycp 2008-09-22 17:03:48.000000000 +0200
+++ new/yast2-bootloader-2.17.27/src/routines/lilolike.ycp 2008-10-13 16:57:05.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: lilolike.ycp 51376 2008-09-22 15:03:47Z juhliarik $
+ * $Id: lilolike.ycp 52077 2008-10-12 08:01:14Z jsrain $
*
*/
{
@@ -1337,62 +1337,15 @@
else
targetMap = (map)Storage::GetTargetMap();
-//FIXME: This is not the final solution, we must be able to handle both,
-//FakeRAIDs _and_ single disks.
-
- // Search in complete target map for "CT_DMRAID" types
- map DMTargetMap = filter (string k, map v, targetMap, {
- return v["type"]:`CT_UNKNOWN==`CT_DMRAID;
+ // filter out members of BIOS RAIDs
+ targetMap = filter (string k, map v, targetMap, {
+ return v["used_by_type"]:nil != `UB_DMRAID;
+ });
+ // filter out non-disk devices
+ targetMap = filter (string k, map v, targetMap, {
+ return v["type"]:`CT_UNKNOWN==`CT_DMRAID || v["type"]:`CT_UNKNOWN==`CT_DISK;
});
- // If no dmraids are present, search in complete target map for "CT_DISK"
- // types. This should be the "normal" case.
- if ( size(DMTargetMap) == 0 ) {
- targetMap = filter (string k, map v, targetMap, {
- return v["type"]:`CT_UNKNOWN==`CT_DISK;
- });
- } else {
- // If dmraid(s) are found, only use them
-
- // Get all available dmraids in the proper BIOS order
- map out = (map) SCR::Execute (.target.bash_output, "dmraid -s -c");
-
- if ( out["exit"]:0 == 0 && out["stdout"]:"" != "" ) {
- list<string> DMRaid_devices_in_BIOS_order =
- splitstring (out["stdout"]:"", "\n");
-
- // Remove last list entry (because it is empty)
- integer index_empty = size(DMRaid_devices_in_BIOS_order) - 1;
- DMRaid_devices_in_BIOS_order =
- remove(DMRaid_devices_in_BIOS_order, index_empty);
-
- integer DMRaidBiosID = 128;
-
- // FIXME: This code only work when YaST2-Storage either assigns
- // BIOS-IDs to all available DMRaid devices or to none of them.
- // Probably it's best to throw this code away once YaST2-Storage
- // assigns BIOS-IDs to all available DMRaid devices.
-
- // Assign BIOS-IDs to DMRaid devices in the Target Map in BIOS
- // order
- DMTargetMap = listmap (string DMRaidDevice, DMRaid_devices_in_BIOS_order, {
- DMRaidDevice = "/dev/mapper/" + DMRaidDevice;
- if (haskey(DMTargetMap, DMRaidDevice)) {
- if ( !haskey(DMTargetMap[DMRaidDevice]:$[], "bios_id") ) {
- DMTargetMap[DMRaidDevice, "bios_id"] = tohexstring(DMRaidBiosID);
- DMRaidBiosID = DMRaidBiosID + 1;
- }
- return $[ DMRaidDevice : DMTargetMap[DMRaidDevice]:$[] ];
- }
- });
- y2milestone("sorted (according to BIOS) DMTargetMap: %1", DMTargetMap);
- } else {
- y2error ("Command: \"dmraid -s -c\" failed, no sorting of DMTargetMap.");
- }
-
- targetMap = DMTargetMap;
- }
-
y2milestone ("Target map: %1", targetMap);
// add devices with known bios_id
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.26/VERSION new/yast2-bootloader-2.17.27/VERSION
--- old/yast2-bootloader-2.17.26/VERSION 2008-10-08 10:49:49.000000000 +0200
+++ new/yast2-bootloader-2.17.27/VERSION 2008-10-13 16:42:20.000000000 +0200
@@ -1 +1 @@
-2.17.26
+2.17.27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org