Mailinglist Archive: opensuse-commit (1097 mails)
| < Previous | Next > |
commit yast2-bootloader for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 14 Jan 2010 18:06:52 +0100
- Message-id: <20100114170652.CAF2F2029C@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Thu Jan 14 18:06:52 CET 2010.
--------
--- yast2-bootloader/yast2-bootloader.changes 2009-10-13 15:49:50.000000000
+0200
+++ yast2-bootloader/yast2-bootloader.changes 2010-01-12 13:35:58.000000000
+0100
@@ -1,0 +2,23 @@
+Tue Jan 12 13:07:25 CET 2010 - juhliarik@xxxxxxx
+
+- added fix for data in device.map if MD RAID from Intel is used
+ (bnc#568837)
+- 2.19.0
+
+-------------------------------------------------------------------
+Wed Dec 9 11:39:18 CET 2009 - juhliarik@xxxxxxx
+
+- added patch for KMS (bnc#561566)
+
+-------------------------------------------------------------------
+Mon Dec 7 14:26:19 CET 2009 - juhliarik@xxxxxxx
+
+- added fix for problem with characters in name (bnc#558542)
+
+-------------------------------------------------------------------
+Fri Dec 4 16:14:07 CET 2009 - juhliarik@xxxxxxx
+
+- added fix for section name mismatch in lilo.conf for PPC
+ (bnc#441051)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.18.17.tar.bz2
New:
----
yast2-bootloader-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.d3p2BA/_old 2010-01-14 18:04:04.000000000 +0100
+++ /var/tmp/diff_new_pack.d3p2BA/_new 2010-01-14 18:04:04.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-bootloader (Version 2.18.17)
+# spec file for package yast2-bootloader (Version 2.19.0)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
Name: yast2-bootloader
-Version: 2.18.17
+Version: 2.19.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.18.17.tar.bz2
+Source0: yast2-bootloader-2.19.0.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPL v2 or later
+License: GPLv2+
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 >= 2.18.18 yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
#!BuildIgnore: autoyast2-installation
@@ -61,7 +61,7 @@
This package contains the YaST2 component for bootloader configuration.
%prep
-%setup -n yast2-bootloader-2.18.17
+%setup -n yast2-bootloader-2.19.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-bootloader-2.18.17.tar.bz2 -> yast2-bootloader-2.19.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.18.17/VERSION
new/yast2-bootloader-2.19.0/VERSION
--- old/yast2-bootloader-2.18.17/VERSION 2009-10-13 15:43:06.000000000
+0200
+++ new/yast2-bootloader-2.19.0/VERSION 2010-01-12 13:10:19.000000000 +0100
@@ -1 +1 @@
-2.18.17
+2.19.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.18.17/src/modules/BootArch.ycp
new/yast2-bootloader-2.19.0/src/modules/BootArch.ycp
--- old/yast2-bootloader-2.18.17/src/modules/BootArch.ycp 2009-06-26
11:18:15.000000000 +0200
+++ new/yast2-bootloader-2.19.0/src/modules/BootArch.ycp 2009-12-09
11:40:20.000000000 +0100
@@ -14,7 +14,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: BootArch.ycp 57477 2009-06-08 08:38:03Z jsrain $
+ * $Id: BootArch.ycp 60011 2009-12-09 10:40:19Z juhliarik $
*
*/
@@ -98,11 +98,11 @@
string ret = "";
if (Arch::i386 ())
{
- ret = "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off
nohz=off highres=off processor.max_cstate=1";
+ ret = "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off
nohz=off highres=off processor.max_cstate=1 nomodeset";
}
else if (Arch::x86_64 ())
{
- ret = "showopts apm=off noresume edd=off powersaved=off nohz=off
highres=off processor.max_cstate=1";
+ ret = "showopts apm=off noresume edd=off powersaved=off nohz=off
highres=off processor.max_cstate=1 nomodeset";
}
else if (Arch::ia64 ())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.18.17/src/modules/BootCommon.ycp
new/yast2-bootloader-2.19.0/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.18.17/src/modules/BootCommon.ycp 2009-10-13
15:21:39.000000000 +0200
+++ new/yast2-bootloader-2.19.0/src/modules/BootCommon.ycp 2009-10-13
15:49:10.000000000 +0200
@@ -15,7 +15,7 @@
* Joachim Plack <jplack@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: BootCommon.ycp 58289 2009-08-06 11:50:12Z juhliarik $
+ * $Id: BootCommon.ycp 59004 2009-10-13 13:49:09Z juhliarik $
*
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-2.18.17/src/modules/BootPOWERLILO.ycp
new/yast2-bootloader-2.19.0/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.18.17/src/modules/BootPOWERLILO.ycp 2009-06-26
11:18:15.000000000 +0200
+++ new/yast2-bootloader-2.19.0/src/modules/BootPOWERLILO.ycp 2009-12-04
16:16:45.000000000 +0100
@@ -15,7 +15,7 @@
* Olaf Dabrunz <od@xxxxxxx>
* Philipp Thomas <pth@xxxxxxx>
*
- * $Id: BootPOWERLILO.ycp 56933 2009-04-23 12:56:26Z juhliarik $
+ * $Id: BootPOWERLILO.ycp 59966 2009-12-04 15:16:44Z juhliarik $
*
*/
@@ -414,7 +414,7 @@
* @param title string the section name to create (untranslated)
* @return map describes the section
*/
-map<string,any> CreateImageSection (string title) {
+global map<string,any> CreateImageSection (string title) {
map<string,any> ret = BootCommon::CreateLinuxSection(title);
//Do not use translated names, as we are happy if it work with kernel
device
ret["root"] = BootStorage::RootPartitionDevice;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.18.17/src/modules/BootStorage.ycp
new/yast2-bootloader-2.19.0/src/modules/BootStorage.ycp
--- old/yast2-bootloader-2.18.17/src/modules/BootStorage.ycp 2009-09-21
10:38:13.000000000 +0200
+++ new/yast2-bootloader-2.19.0/src/modules/BootStorage.ycp 2010-01-06
16:50:28.000000000 +0100
@@ -708,6 +708,71 @@
});
}
+
+/**
+ * Check if MD raid is build on disks not on paritions
+ * @param devices - list of devices from MD raid
+ * @param tm - unfiltered target map
+ * @return - true if MD RAID is build on disks (not on partitions)
+ */
+
+boolean checkMDRaidDevices(list<string> devices, map<string,map> tm)
+{
+ boolean ret = true;
+ foreach (string key, devices, {
+ if (key != "" && ret)
+ {
+ if (tm[key]:nil != nil)
+ ret = true;
+ else
+ ret = false;
+ }
+ });
+ return ret;
+}
+
+/**
+ * Function check if disk is in list of devices
+ * @param string disk
+ * @param list<string> list of devices
+ * @return true if success
+ */
+
+boolean isDiskInList (string disk, list<string> devices)
+{
+ boolean ret = false;
+ foreach(string dev, devices,
+ {
+ if (dev == disk)
+ {
+ ret = true;
+ break;
+ }
+ });
+ return ret;
+}
+
+/**
+ * Check if disk is in MDRaid it means completed disk is used in RAID
+ * @param disk (/dev/sda)
+ * @param tm - target map
+ * @return - true if disk (not only part of disk) is in MDRAID
+ */
+boolean isDiskInMDRaid (string disk, map<string,map> tm)
+{
+ boolean ret = false;
+ foreach( string dev, map d_info, tm,
+ {
+ if (d_info["type"]:nil == `CT_MDPART)
+ ret = isDiskInList(disk, d_info["devices"]:[]);
+ if (ret)
+ break;
+ });
+ return ret;
+}
+
+
+
/*** helper functions END ***/
/**
@@ -742,14 +807,17 @@
else
targetMap = (map<string,map>)Storage::GetTargetMap();
- // filter out members of BIOS RAIDs and multipath devices
- targetMap = filter (string k, map v, targetMap, {
- return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil !=
`UB_DMMULTIPATH;
- });
// 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
- || v["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH;
+ || v["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH ||
+ (v["type"]:`CT_UNKNOWN==`CT_MDPART &&
checkMDRaidDevices(v["devices"]:[], targetMap));
+ });
+
+ // filter out members of BIOS RAIDs and multipath devices
+ targetMap = filter (string k, map v, targetMap, {
+ return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil !=
`UB_DMMULTIPATH&&
+ ((v["used_by_type"]:nil == `UB_MDPART) ?
(!isDiskInMDRaid(k,targetMap)):true);
});
y2milestone ("Target map: %1", targetMap);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.18.17/src/modules/Bootloader.ycp
new/yast2-bootloader-2.19.0/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.18.17/src/modules/Bootloader.ycp 2009-10-13
15:25:46.000000000 +0200
+++ new/yast2-bootloader-2.19.0/src/modules/Bootloader.ycp 2009-12-04
16:16:45.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: Bootloader.ycp 58289 2009-08-06 11:50:12Z juhliarik $
+ * $Id: Bootloader.ycp 59966 2009-12-04 15:16:44Z juhliarik $
*
*/
@@ -39,7 +39,6 @@
import "BootPOWERLILO"; // The ppc-LILO File
//fate 303395
import "ProductFeatures";
- import "Arch";
// interface for clients
global define map Export ();
@@ -842,9 +841,18 @@
return;
}
y2milestone("Deleting duplicated boot sections");
- map<string,any> linux_default = BootCommon::CreateLinuxSection
("linux");
- map<string,any> linux_failsafe = BootCommon::CreateLinuxSection
("failsafe");
- map<string,any> linux_xen = BootCommon::CreateLinuxSection ("xen");
+
+ map<string,any> linux_default = $[];
+ map<string,any> linux_failsafe = $[];
+ map<string,any> linux_xen = $[];
+ if (Arch::ppc())
+ {
+ linux_default = BootPOWERLILO::CreateImageSection("linux");
+ } else {
+ linux_default = BootCommon::CreateLinuxSection ("linux");
+ linux_failsafe = BootCommon::CreateLinuxSection ("failsafe");
+ linux_xen = BootCommon::CreateLinuxSection ("xen");
+ }
y2milestone("Proposed section for linux_default: %1", linux_default);
y2milestone("Proposed section for linux_failsafe: %1", linux_failsafe);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.18.17/src/routines/misc.ycp
new/yast2-bootloader-2.19.0/src/routines/misc.ycp
--- old/yast2-bootloader-2.18.17/src/routines/misc.ycp 2009-10-13
15:38:55.000000000 +0200
+++ new/yast2-bootloader-2.19.0/src/routines/misc.ycp 2009-10-13
15:49:10.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: misc.ycp 58189 2009-07-28 11:22:53Z juhliarik $
+ * $Id: misc.ycp 59004 2009-10-13 13:49:09Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-2.18.17/src/routines/section_widgets.ycp
new/yast2-bootloader-2.19.0/src/routines/section_widgets.ycp
--- old/yast2-bootloader-2.18.17/src/routines/section_widgets.ycp
2009-09-03 13:20:39.000000000 +0200
+++ new/yast2-bootloader-2.19.0/src/routines/section_widgets.ycp
2009-12-07 14:28:00.000000000 +0100
@@ -13,7 +13,7 @@
* Olaf Dabrunz <od@xxxxxxx>
* Josef Reidinger <jreidinger@xxxxxxx>
*
- * $Id: section_widgets.ycp 58488 2009-09-03 11:20:38Z juhliarik $
+ * $Id: section_widgets.ycp 59979 2009-12-07 13:27:59Z juhliarik $
*
*/
@@ -356,7 +356,7 @@
if ((Mode::normal()) && (bl == "grub"))
{
string filtered_new =
- filterchars (new,
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 _.-()");
+ filterchars (new,
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 /\\_.-()");
if (filtered_new != new)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |