Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Mon Oct 27 17:23:57 CET 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-10-22 10:17:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-10-27 17:17:46.032518000 +0100
@@ -1,0 +2,31 @@
+Mon Oct 27 12:45:44 CET 2008 - juhliarik@suse.cz
+
+- updated checking of boot device s not on XFS (bnc #438757)
+- added fix for problem with generic boot code (bnc #438752)
+- 2.17.34
+
+-------------------------------------------------------------------
+Mon Oct 27 10:39:37 CET 2008 - jsrain@suse.cz
+
+- updated method of ThinkPad MBR detection
+- 2.17.33
+
+-------------------------------------------------------------------
+Mon Oct 27 10:21:57 CET 2008 - juhliarik@suse.cz
+
+- added fix for using persistent device name in lilo (bnc #437764)
+- 2.17.32
+
+-------------------------------------------------------------------
+Fri Oct 24 14:25:23 CEST 2008 - juhliarik@suse.cz
+
+- added fix for problem with converting lilo to grub during update
+ system
+- added fix - deleting read-only option for elilo (bnc #438276)
+
+-------------------------------------------------------------------
+Thu Oct 23 14:25:18 CEST 2008 - juhliarik@suse.cz
+
+- added fix for broken titles in lilo (bnc #437693)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.31.tar.bz2
New:
----
yast2-bootloader-2.17.34.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.j22578/_old 2008-10-27 17:23:29.000000000 +0100
+++ /var/tmp/diff_new_pack.j22578/_new 2008-10-27 17:23:29.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.31)
+# spec file for package yast2-bootloader (Version 2.17.34)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.31
+Version: 2.17.34
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.31.tar.bz2
+Source0: yast2-bootloader-2.17.34.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:
@@ -64,7 +64,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.31
+%setup -n yast2-bootloader-2.17.34
%build
%{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,22 @@
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Mon Oct 27 2008 juhliarik@suse.cz
+- updated checking of boot device s not on XFS (bnc #438757)
+- added fix for problem with generic boot code (bnc #438752)
+- 2.17.34
+* Mon Oct 27 2008 jsrain@suse.cz
+- updated method of ThinkPad MBR detection
+- 2.17.33
+* Mon Oct 27 2008 juhliarik@suse.cz
+- added fix for using persistent device name in lilo (bnc #437764)
+- 2.17.32
+* Fri Oct 24 2008 juhliarik@suse.cz
+- added fix for problem with converting lilo to grub during update
+ system
+- added fix - deleting read-only option for elilo (bnc #438276)
+* Thu Oct 23 2008 juhliarik@suse.cz
+- added fix for broken titles in lilo (bnc #437693)
* Tue Oct 21 2008 juhliarik@suse.cz
- update for bug with deleting boot section (bnc #436890)
- 2.17.31
@@ -437,7 +453,7 @@
- forgot to use changed sections (feature #302302)
- added logging with y2milestone()s for last change
- 2.15.17
-* Tue Aug 14 2007 od@suse.de
+* Mon Aug 13 2007 od@suse.de
- grub: feature #302302:
- added code to UpdateSections() to update old sections for
"other" installations to chainloader/configfile sections
@@ -787,7 +803,7 @@
- 2.14.7
* Tue Nov 21 2006 jplack@suse.de
- "activate" and "generic_mbr" do now get set if newly proposed
-* Tue Nov 21 2006 od@suse.de
+* Mon Nov 20 2006 od@suse.de
- #214935:
- added more comments
- only resolve symlinks for linux, xen and failsafe sections,
@@ -978,7 +994,7 @@
- fixed installation of installation kernel (ISERIES64) into slot A
on iSeries (#165497)
- 2.13.64
-* Thu May 18 2006 od@suse.de
+* Wed May 17 2006 od@suse.de
- fix backwards mapping of "mount by" device names when bl
configuration is read (#176201)
- revert last change in MountByDev2Dev() and use y2milestone()
@@ -1082,7 +1098,7 @@
attach version anymore (#163702)
- fixed typo in message
- 2.13.46
-* Wed Apr 12 2006 od@suse.de
+* Tue Apr 11 2006 od@suse.de
- on pmac: propose only partitions smaller than 20 cylinders
(#158543)
- 2.13.45
@@ -1224,7 +1240,7 @@
- fixed comment in chrp.ycp explaining the use of
prep_same_disk_as_root
- 2.13.20
-* Wed Mar 08 2006 od@suse.de
+* Tue Mar 07 2006 od@suse.de
- #145597:
- use old working proposal code from BootPPC in BootPOWERLILO
- add comments where needed to understand the code
++++++ yast2-bootloader-2.17.31.tar.bz2 -> yast2-bootloader-2.17.34.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/scripts/examine_mbr.pl new/yast2-bootloader-2.17.34/scripts/examine_mbr.pl
--- old/yast2-bootloader-2.17.31/scripts/examine_mbr.pl 2008-07-21 16:04:50.000000000 +0200
+++ new/yast2-bootloader-2.17.34/scripts/examine_mbr.pl 2008-10-27 12:41:45.000000000 +0100
@@ -45,7 +45,7 @@
if (substr($MBR, 320, 126) =~
m,invalid partition table.*no operating system,i) {
print "Generic MBR\n";
- exit 0;
+ exit 254;
}
if (substr($MBR, 346, 100) =~ m,GRUB .Geom.Hard Disk.Read. Error,) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/src/clients/inst_lilo_convert.ycp new/yast2-bootloader-2.17.34/src/clients/inst_lilo_convert.ycp
--- old/yast2-bootloader-2.17.31/src/clients/inst_lilo_convert.ycp 2008-09-30 16:14:15.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/clients/inst_lilo_convert.ycp 2008-10-23 15:58:11.000000000 +0200
@@ -29,6 +29,7 @@
import "Pkg";
import "Arch";
import "BootGRUB";
+import "PackagesProposal";
y2milestone ("starting inst_lilo_convert");
@@ -38,11 +39,7 @@
void selectPackage()
{
- if (! Pkg::IsSelected("grub"))
- {
- Pkg::PkgInstall ("grub");
- Pkg::PkgSolve (false);
- }
+ PackagesProposal::AddResolvables ("yast2-bootloader", `package, ["grub"]);
}
void convertSettings()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/src/grub/misc.ycp new/yast2-bootloader-2.17.34/src/grub/misc.ycp
--- old/yast2-bootloader-2.17.31/src/grub/misc.ycp 2008-10-16 15:26:51.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/grub/misc.ycp 2008-10-27 13:22:52.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 52296 2008-10-16 13:26:49Z juhliarik $
+ * $Id: misc.ycp 52575 2008-10-27 12:22:51Z juhliarik $
*
*/
@@ -613,7 +613,7 @@
// bytes from <dev>"
// - 254 for an "invalid MBR", i.e. without enough entropy to
// contain boot code
- // - 0 for a "Generic MBR" (DOS MBR)
+ // - 254 for a "Generic MBR" (DOS MBR) - bnc #438752
// - 254 for a GRUB or lilo "stage 1"
// - 254 for an unknown MBR
// - 0 for Vista MBR
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/src/modules/BootCommon.ycp new/yast2-bootloader-2.17.34/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.17.31/src/modules/BootCommon.ycp 2008-10-21 12:08:53.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/modules/BootCommon.ycp 2008-10-27 10:29:22.000000000 +0100
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootCommon.ycp 52385 2008-10-21 10:08:52Z juhliarik $
+ * $Id: BootCommon.ycp 52557 2008-10-27 09:29:22Z juhliarik $
*
*/
@@ -856,7 +856,7 @@
// also, for legacy bootloaders like LILO that still pass device names,
// convert the stage1_dev
map my_globals = mapmap (string k , string v, globals, {
- if ( k == "stage1_dev" || regexpmatch(k, "^boot_.*custom$" ) )
+ if ((k == "stage1_dev") || (regexpmatch(k, "^boot_.*custom$" )) || (k == "boot_chrp_custom"))
//return $[k : BootCommon::Dev2MountByDev(v)];
return $[k : BootCommon::Dev2MountByDev(v)];
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/src/modules/BootELILO.ycp new/yast2-bootloader-2.17.34/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.17.31/src/modules/BootELILO.ycp 2008-10-13 17:01:00.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/modules/BootELILO.ycp 2008-10-27 10:29:22.000000000 +0100
@@ -17,7 +17,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootELILO.ycp 52151 2008-10-13 15:00:57Z juhliarik $
+ * $Id: BootELILO.ycp 52557 2008-10-27 09:29:22Z juhliarik $
*
*/
@@ -177,12 +177,10 @@
"default" : "linux",
"timeout" : "80",
"prompt" : "true",
- "read-only" : "true",
+ // bnc #438276 - remove deprecated 'read-only'
+ // "read-only" : "true",
"relocatable" : "true"
];
- // added fix because option relocatable is only for ia32/64
- if ((Arch::ia64()) && (haskey(BootCommon::globals, "relocatable")))
- BootCommon::globals = remove(BootCommon::globals, "relocatable");
}
@@ -461,6 +459,8 @@
global define boolean Write () {
// SCR::Execute (.target.bash, "/sbin/elilo");
boolean ret = BootCommon::UpdateBootloader ();
+ if (ret == nil)
+ ret = false;
// FIXME find a better way to report status
if (ret && ! efi_available) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.17.34/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.17.31/src/modules/BootPOWERLILO.ycp 2008-10-08 15:30:26.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/modules/BootPOWERLILO.ycp 2008-10-23 14:27:47.000000000 +0200
@@ -16,7 +16,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootPOWERLILO.ycp 51990 2008-10-08 13:30:24Z juhliarik $
+ * $Id: BootPOWERLILO.ycp 52457 2008-10-23 12:27:46Z juhliarik $
*
*/
@@ -34,7 +34,6 @@
import "Pkg";
import "Stage";
import "Storage";
-import "GfxMenu";
/*
* include ppc specific help messages
@@ -459,7 +458,7 @@
map ret = $[
"type" : "image",
- "name" : GfxMenu::translateSectionTitle(title, "ppc"),
+ "name" : title,
"original_name" : title,
"image" : image_fn,
"initrd" : initrd_fn,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/src/modules/BootSupportCheck.ycp new/yast2-bootloader-2.17.34/src/modules/BootSupportCheck.ycp
--- old/yast2-bootloader-2.17.31/src/modules/BootSupportCheck.ycp 2008-10-13 16:57:05.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/modules/BootSupportCheck.ycp 2008-10-27 12:23:03.000000000 +0100
@@ -177,39 +177,26 @@
} else {
found_boot = true;
y2milestone("The boot device: %1 is not on raid0", boot_device);
- break;
+ //break;
}
+ // check if /boot directory is on supported filesystem
+ if (p["used_fs"]:nil == `xfs) {
+ AddNewProblem (_("The /boot directory is on an XFS filesystem"));
+ y2error ("The /boot directory is on an XFS filesystem");
+ result = false;
+ break;
+ } else {
+ found_boot = true;
+ y2milestone ("/boot filesystem is OK");
+ 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.31/src/routines/i386.ycp new/yast2-bootloader-2.17.34/src/routines/i386.ycp
--- old/yast2-bootloader-2.17.31/src/routines/i386.ycp 2008-07-21 16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/routines/i386.ycp 2008-10-27 12:09:27.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: i386.ycp 34952 2006-12-14 12:57:33Z jplack $
+ * $Id: i386.ycp 52559 2008-10-27 09:39:52Z jsrain $
*
*/
{
@@ -94,7 +94,13 @@
{
_old_thinkpad_disk = disk;
string mbr = GetMBRContents (disk);
- _thinkpad_mbr = issubstring (mbr, thinkpad_seq);
+ integer x02 = tointeger ("0x" + substring (mbr, 4, 2));
+ integer x03 = tointeger ("0x" + substring (mbr, 6, 2));
+ string x0e = substring (mbr, 28, 2);
+ string x0f = substring (mbr, 30, 2);
+ y2internal ("Data: %1 %2 %3 %4", x02, x03, x0e, x0f);
+ _thinkpad_mbr = (2 <= x02 && x02 <= tointeger ("0x63") && 2 <= x03 && x03 <= tointeger ("0x63") &&
+ tolower (x0e) == "4e" && tolower (x0f) == "50");
}
y2milestone ("MBR of %1 contains ThinkPad sequence: %2",
disk, _thinkpad_mbr);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/src/routines/lilolike.ycp new/yast2-bootloader-2.17.34/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.17.31/src/routines/lilolike.ycp 2008-10-21 19:25:52.000000000 +0200
+++ new/yast2-bootloader-2.17.34/src/routines/lilolike.ycp 2008-10-27 13:22:52.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: lilolike.ycp 52408 2008-10-21 17:25:51Z juhliarik $
+ * $Id: lilolike.ycp 52575 2008-10-27 12:22:51Z juhliarik $
*
*/
{
@@ -254,7 +254,7 @@
// bytes from <dev>"
// - 254 for an "invalid MBR", i.e. without enough entropy to
// contain boot code
- // - 0 for a "Generic MBR" (DOS MBR)
+ // - 254 for a "Generic MBR" (DOS MBR) - bnc #438752
// - 254 for a GRUB or lilo "stage 1"
// - 254 for an unknown MBR
// - 0 for a Vista MBR
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.31/VERSION new/yast2-bootloader-2.17.34/VERSION
--- old/yast2-bootloader-2.17.31/VERSION 2008-10-21 18:34:53.000000000 +0200
+++ new/yast2-bootloader-2.17.34/VERSION 2008-10-27 13:21:52.000000000 +0100
@@ -1 +1 @@
-2.17.31
+2.17.34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org