Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Wed Oct 8 12:06:35 CEST 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-10-06 11:01:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-10-08 10:54:17.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Oct 8 10:39:12 CEST 2008 - juhliarik@suse.cz
+
+- added fix for adding crashkernel from y2-kdump (bnc #432651)
+- added fix for writing proposal (bnc #433344)
+- added fix for checking if boot device is on raid0 (bnc #156800)
+- 2.17.26
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.25.tar.bz2
New:
----
yast2-bootloader-2.17.26.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.b17283/_old 2008-10-08 12:06:06.000000000 +0200
+++ /var/tmp/diff_new_pack.b17283/_new 2008-10-08 12:06:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.25)
+# spec file for package yast2-bootloader (Version 2.17.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.25
+Version: 2.17.26
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.25.tar.bz2
+Source0: yast2-bootloader-2.17.26.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.25
+%setup -n yast2-bootloader-2.17.26
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,6 +107,11 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Wed Oct 08 2008 juhliarik@suse.cz
+- added fix for adding crashkernel from y2-kdump (bnc #432651)
+- added fix for writing proposal (bnc #433344)
+- added fix for checking if boot device is on raid0 (bnc #156800)
+- 2.17.26
* Fri Oct 03 2008 juhliarik@suse.cz
- added fix for installing packages (bnc #431580)
- added fix for 2 identical section in powerLILO (bnc #427730)
++++++ yast2-bootloader-2.17.25.tar.bz2 -> yast2-bootloader-2.17.26.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/clients/bootloader_proposal.ycp new/yast2-bootloader-2.17.26/src/clients/bootloader_proposal.ycp
--- old/yast2-bootloader-2.17.25/src/clients/bootloader_proposal.ycp 2008-09-29 12:51:36.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/clients/bootloader_proposal.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -1,7 +1,7 @@
/**
* Module: bootloader_proposal.ycp
*
- * $Id: bootloader_proposal.ycp 51099 2008-09-12 12:21:26Z juhliarik $
+ * $Id: bootloader_proposal.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
* Author: Klaus Kaempf
*
@@ -17,6 +17,7 @@
import "Bootloader";
import "Storage";
import "Mode";
+ import "BootSupportCheck";
include "bootloader/routines/wizards.ycp";
@@ -90,7 +91,7 @@
BootGRUB::merge_level = `main;
Bootloader::Propose ();
-
+
BootGRUB::merge_level = `none;
}
else
@@ -120,6 +121,8 @@
);
return ret;
}
+
+
}
//F#300779 - Install diskless client (NFS-root)
@@ -200,6 +203,18 @@
}
}
+ if (!BootSupportCheck::SystemSupported())
+ {
+ ret = (map)
+ union(ret,
+ $[
+ "warning_level" : `error,
+ "warning" : BootSupportCheck::StringProblems(),
+ "raw_proposal" : Bootloader::Summary (),
+ ]);
+
+ }
+
// cache the values
Bootloader::cached_settings = Bootloader::Export();
Bootloader::cached_settings_base_data_change_time = Storage::GetTargetChangeTime();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/modules/BootCommon.ycp new/yast2-bootloader-2.17.26/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.17.25/src/modules/BootCommon.ycp 2008-10-03 17:27:35.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/modules/BootCommon.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootCommon.ycp 51842 2008-10-03 15:27:33Z juhliarik $
+ * $Id: BootCommon.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
*/
@@ -485,7 +485,7 @@
"original_name" : title,
"type" : "image",
"__auto" : true,
- "__changed" : false,
+ "__changed" : true,
];
if (title == "memtest86") {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/modules/BootELILO.ycp new/yast2-bootloader-2.17.26/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.17.25/src/modules/BootELILO.ycp 2008-09-22 17:03:48.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/modules/BootELILO.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -17,7 +17,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootELILO.ycp 51376 2008-09-22 15:03:47Z juhliarik $
+ * $Id: BootELILO.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
*/
@@ -38,6 +38,7 @@
import "Stage";
import "Storage";
import "String";
+import "Arch";
include "bootloader/elilo/helps.ycp";
include "bootloader/routines/popups.ycp";
@@ -173,6 +174,10 @@
"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");
+
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/modules/BootGRUB.ycp new/yast2-bootloader-2.17.26/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.17.25/src/modules/BootGRUB.ycp 2008-09-18 17:32:36.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/modules/BootGRUB.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -15,7 +15,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootGRUB.ycp 51099 2008-09-12 12:21:26Z juhliarik $
+ * $Id: BootGRUB.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
*/
@@ -338,7 +338,7 @@
// set up the new section entry
map new_sect = $[
"root" : BootCommon::Dev2MountByDev(dev),
- "__changed" : false,
+ "__changed" : true,
"__auto" : true,
"__devs" : [dev]
];
@@ -422,7 +422,7 @@
"type" : "other",
"original_name" : label,
"chainloader" : BootCommon::Dev2MountByDev(dev),
- "__changed" : false,
+ "__changed" : true,
"__auto" : true,
"__devs" : [dev],
];
@@ -440,7 +440,7 @@
"original_name" : "hard_disk",
"type" : "other",
"chainloader" : BootCommon::Dev2MountByDev(BootCommon::mbrDisk),
- "__changed" : false,
+ "__changed" : true,
"__auto" : true,
"__devs" : [],
]);
@@ -452,7 +452,7 @@
"original_name" : "floppy",
"type" : "other",
"chainloader" : "/dev/fd0",
- "__changed" : false,
+ "__changed" : true,
"__auto" : true,
"__devs" : [],
]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/modules/BootLILO.ycp new/yast2-bootloader-2.17.26/src/modules/BootLILO.ycp
--- old/yast2-bootloader-2.17.25/src/modules/BootLILO.ycp 2008-07-21 16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/modules/BootLILO.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -14,7 +14,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootLILO.ycp 47885 2008-05-26 16:34:24Z juhliarik $
+ * $Id: BootLILO.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
*/
@@ -92,7 +92,7 @@
"type" : "chainloader",
"chainloader" : dev,
"__auto" : true,
- "__changed" : false,
+ "__changed" : true,
"__devs" : [dev],
];
out = add (out, m);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.26/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.17.25/src/modules/Bootloader.ycp 2008-09-29 16:40:07.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/modules/Bootloader.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 51298 2008-09-18 16:00:55Z juhliarik $
+ * $Id: Bootloader.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
*/
@@ -1156,6 +1156,8 @@
if (value != "false")
{
BootCommon::sections[sectnum, key] = value;
+ // added flag that section was modified bnc #432651
+ BootCommon::sections[sectnum, "__changed"] = true;
}
else
{
@@ -1168,6 +1170,8 @@
string line = BootCommon::sections [sectnum, "append"]:"";
line = BootCommon::setKernelParamToLine (line, key, value);
BootCommon::sections [sectnum, "append"] = line;
+ // added flag that section was modified bnc #432651
+ BootCommon::sections[sectnum, "__changed"] = true;
}
BootCommon::changed = true;
boolean ret = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.17.26/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.17.25/src/modules/BootPOWERLILO.ycp 2008-10-03 17:26:41.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/modules/BootPOWERLILO.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -16,7 +16,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootPOWERLILO.ycp 51841 2008-10-03 15:26:39Z juhliarik $
+ * $Id: BootPOWERLILO.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
*/
@@ -468,7 +468,7 @@
// "": do not include resume parameter on ppc
"append" : BootArch::DefaultKernelParams (""),
"__auto" : true,
- "__changed" : false,
+ "__changed" : true,
"__devs" : [BootCommon::BootPartitionDevice, BootCommon::RootPartitionDevice],
];
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/modules/BootSupportCheck.ycp new/yast2-bootloader-2.17.26/src/modules/BootSupportCheck.ycp
--- old/yast2-bootloader-2.17.25/src/modules/BootSupportCheck.ycp 2008-09-29 16:38:06.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/modules/BootSupportCheck.ycp 2008-10-07 18:37:35.000000000 +0200
@@ -46,6 +46,27 @@
return detected_problems;
}
+
+/**
+ * Formated string of detected problems
+ * Always run SystemSupported before calling this function
+ * @return boolean a list of problems, empty if no was found
+ */
+global string StringProblems () {
+
+ string ret = "";
+ if (size(detected_problems) > 0)
+ {
+ foreach(string s, detected_problems,
+ {
+ ret = ret + s + "\n";
+ });
+ }
+
+ return ret;
+}
+
+
/**
* Check that bootloader is known and supported
*/
@@ -115,6 +136,61 @@
return true;
}
+
+/**
+ * Check if boot partition exist
+ * check if not on raid0
+ *
+ * @return boolean true on success
+ */
+
+
+boolean check_BootDevice()
+{
+ boolean result = true;
+ string boot_device = "";
+
+ map devices = (map)Storage::GetTargetMap();
+
+
+ boot_device = BootCommon::getBootPartition();
+
+ // if (BootCommon::BootPartitionDevice == BootCommon::RootPartitionDevice)
+ // AddNewProblem (_("Doesn't exist separete /boot partition"));
+
+ boolean found_boot = false;
+ // check if boot device is on raid0
+ if (boot_device != "")
+ {
+ foreach (string k, map v, devices,
+ {
+ foreach (map p, (list<map>)(v["partitions"]:[]),
+ {
+ if (p["device"]:"" == boot_device)
+ {
+ if (p["raid_type"]:"" == "raid0")
+ {
+ AddNewProblem (_("The boot device is on raid0."));
+ y2error("The boot device: %1 is on raid0", boot_device);
+ result = false;
+ break;
+ } else {
+ found_boot = true;
+ y2milestone("The boot device: %1 is not on raid0", boot_device);
+ break;
+ }
+ }
+ });
+ if ((!result) || (found_boot))
+ break;
+ });
+ }
+ return result;
+}
+
+
+
+
/**
* Check that the root partition is reachable
*/
@@ -125,8 +201,10 @@
/**
* GRUB-related check
*/
-boolean GRUB () {
+global boolean GRUB () {
boolean ret = GptPartitionTable ();
+ if (ret)
+ ret = check_BootDevice();
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/src/routines/lib_iface.ycp new/yast2-bootloader-2.17.26/src/routines/lib_iface.ycp
--- old/yast2-bootloader-2.17.25/src/routines/lib_iface.ycp 2008-09-18 17:37:21.000000000 +0200
+++ new/yast2-bootloader-2.17.26/src/routines/lib_iface.ycp 2008-10-08 10:38:54.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: lib_iface.ycp 51295 2008-09-18 15:37:20Z juhliarik $
+ * $Id: lib_iface.ycp 51956 2008-10-08 08:38:52Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only
@@ -157,7 +157,7 @@
sections = maplist (map s, sections, {
if (Mode::normal())
{
- if (s["__changed"]:false)
+ if ((s["__changed"]:false) || (s["__auto"]:false))
s["__modified"] = "1";
} else {
s["__modified"] = "1";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.25/VERSION new/yast2-bootloader-2.17.26/VERSION
--- old/yast2-bootloader-2.17.25/VERSION 2008-10-03 10:42:43.000000000 +0200
+++ new/yast2-bootloader-2.17.26/VERSION 2008-10-08 10:49:49.000000000 +0200
@@ -1 +1 @@
-2.17.25
+2.17.26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org