Mailinglist Archive: opensuse-commit (817 mails)
| < Previous | Next > |
commit yast2-bootloader for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 15 Dec 2008 15:13:17 +0100
- Message-id: <20081215141317.ED3EA678166@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Mon Dec 15 15:13:17 CET 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-12-04 10:05:25.000000000
+0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes
2008-12-11 17:56:24.000000000 +0100
@@ -1,0 +2,22 @@
+Thu Dec 11 17:43:40 CET 2008 - juhliarik@xxxxxxx
+
+- added fix for problem with autoinstallation and powerlilo
+ (bnc #439674)
+- added fix for bnc #450506 root=kernelname
+- added fix for problem with adding kernel to proposal (SLERT)
+ (bnc #450153)
+- 2.17.46
+
+-------------------------------------------------------------------
+Mon Dec 8 15:41:43 CET 2008 - juhliarik@xxxxxxx
+
+- added fix for problem with installation if boot device is NFS
+ (bnc #440183)
+
+-------------------------------------------------------------------
+Sun Dec 7 14:45:22 CET 2008 - juhliarik@xxxxxxx
+
+- deleted support of detail settings for trustedgrub because it is
+ not supporeted by trustedgrub package
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.45.tar.bz2
New:
----
yast2-bootloader-2.17.46.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Ak9118/_old 2008-12-15 15:12:50.000000000 +0100
+++ /var/tmp/diff_new_pack.Ak9118/_new 2008-12-15 15:12:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.45)
+# spec file for package yast2-bootloader (Version 2.17.46)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.45
+Version: 2.17.46
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.45.tar.bz2
+Source0: yast2-bootloader-2.17.46.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:
@@ -68,7 +68,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.45
+%setup -n yast2-bootloader-2.17.46
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,19 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Thu Dec 11 2008 juhliarik@xxxxxxx
+- added fix for problem with autoinstallation and powerlilo
+ (bnc #439674)
+- added fix for bnc #450506 root=kernelname
+- added fix for problem with adding kernel to proposal (SLERT)
+ (bnc #450153)
+- 2.17.46
+* Mon Dec 08 2008 juhliarik@xxxxxxx
+- added fix for problem with installation if boot device is NFS
+ (bnc #440183)
+* Sun Dec 07 2008 juhliarik@xxxxxxx
+- deleted support of detail settings for trustedgrub because it is
+ not supporeted by trustedgrub package
* Thu Dec 04 2008 juhliarik@xxxxxxx
- 2.17.45
* Tue Dec 02 2008 juhliarik@xxxxxxx
++++++ yast2-bootloader-2.17.45.tar.bz2 -> yast2-bootloader-2.17.46.tar.bz2
++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/scripts/tp_mbr
new/yast2-bootloader-2.17.46/scripts/tp_mbr
--- old/yast2-bootloader-2.17.45/scripts/tp_mbr 2008-07-21 16:04:50.000000000
+0200
+++ new/yast2-bootloader-2.17.46/scripts/tp_mbr 2008-12-08 15:35:20.000000000
+0100
@@ -57,6 +57,7 @@
$old_mbr_sec = $mbr[7];
+=cut
# just a quick check
die "$disk: np tp mbr\n" unless
$mbr[0x17b] == 0x50 &&
@@ -64,11 +65,12 @@
$mbr[0x17d] == 0x61 &&
$mbr[0x17e] == 0x24 &&
$old_mbr_sec > 1;
-
+=cut
# read original mbr
seek F, ($old_mbr_sec - 1) << 9, 0 or die "$disk: $!\n";
+print "number $old_mbr_sec : seek ".(($old_mbr_sec-1)<<9);
sysread F, $old_mbr, 0x200;
@@ -88,7 +90,6 @@
die "$disk: orig mbr crc failure\n" unless crc(\@old_mbr) == $mbr[6];
}
-
# store new mbr & update crc
substr($old_mbr, 0, length $new_mbr) = $new_mbr;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-bootloader-2.17.45/src/clients/inst_bootloader.ycp
new/yast2-bootloader-2.17.46/src/clients/inst_bootloader.ycp
--- old/yast2-bootloader-2.17.45/src/clients/inst_bootloader.ycp
2008-07-30 14:00:40.000000000 +0200
+++ new/yast2-bootloader-2.17.46/src/clients/inst_bootloader.ycp
2008-12-10 13:33:38.000000000 +0100
@@ -40,16 +40,26 @@
y2milestone("contents FILES: %1", files);
+ //F#300779 - Install diskless client (NFS-root)
+ //kokso: bootloader will not be installed
+ string device = BootCommon::getBootDisk();
- foreach (string file, string content, files,
+ if (device == "/dev/nfs")
{
-
- integer last=findlastof(file,"/");
- string path_file = substring (file, 0, last);
- WFM::Execute(.local.mkdir, Installation::destdir + path_file);
- y2milestone ("writing file: %1", file);
- WFM::Write(.local.string, Installation::destdir + file, content);
- });
+ y2milestone("inst_bootloader -> Boot partition is nfs type,
bootloader will not be installed.");
+ BootCommon::InitializeLibrary(true, "none");
+ BootCommon::setLoaderType("none");
+
+ } else {
+ foreach (string file, string content, files,
+ {
+ integer last=findlastof(file,"/");
+ string path_file = substring (file, 0, last);
+ WFM::Execute(.local.mkdir, Installation::destdir + path_file);
+ y2milestone ("writing file: %1", file);
+ WFM::Write(.local.string, Installation::destdir + file,
content);
+ });
+ }
}
// FATE #302245 save kernel args etc to /etc/sysconfig/bootloader
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/generic/wizards.ycp
new/yast2-bootloader-2.17.46/src/generic/wizards.ycp
--- old/yast2-bootloader-2.17.45/src/generic/wizards.ycp 2008-09-25
17:44:19.000000000 +0200
+++ new/yast2-bootloader-2.17.46/src/generic/wizards.ycp 2008-12-08
15:35:20.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: wizards.ycp 51543 2008-09-25 15:44:18Z juhliarik $
+ * $Id: wizards.ycp 53957 2008-12-07 13:43:38Z juhliarik $
*
*/
@@ -77,7 +77,6 @@
`HSpacing (2)
)
),
- "trusted",
`VStretch ()
),
@@ -86,7 +85,7 @@
return CWM::ShowAndRun ($[
"widget_descr" : widget_descr,
- "widget_names" : ["name", "trusted", se_type],
+ "widget_names" : ["name", se_type],
"contents" : contents,
"caption" : _("Boot Loader Settings: Section Management"),
"back_button" : Label::BackButton (),
@@ -142,7 +141,6 @@
"main" : ``(MainDialog ()),
"installation_details" : ``(DetailsDialog ("installation")),
"loader_details" : ``(DetailsDialog ("loader")),
- "t_grub" : ``(DetailsDialog ("trusted_grub")),
"add_new_section" : ``(AddNewSectionDialog ()),
"store_section" : [``(GenericStoreSection ()), true],
"manual_edit" : ``(runEditFilesDialog ()),
@@ -186,12 +184,6 @@
],
"section_edit" : $[
`next : "store_section",
- `trusted_details : "t_grub",
- `abort : `abort,
- ],
- "t_grub" : $[
- `next : "section_edit",
- //FIXME kokso: it is good idea handle abort via "section_edit" not
`abort
`abort : `abort,
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/grub/Makefile.am
new/yast2-bootloader-2.17.46/src/grub/Makefile.am
--- old/yast2-bootloader-2.17.45/src/grub/Makefile.am 2008-09-01
13:03:18.000000000 +0200
+++ new/yast2-bootloader-2.17.46/src/grub/Makefile.am 2008-12-08
15:35:20.000000000 +0100
@@ -6,8 +6,7 @@
ynclude_DATA = \
helps.ycp \
- misc.ycp \
- trusted_grub_edit.ycp
+ misc.ycp
EXTRA_DIST = \
$(ynclude_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/grub/Makefile.in
new/yast2-bootloader-2.17.46/src/grub/Makefile.in
--- old/yast2-bootloader-2.17.45/src/grub/Makefile.in 2008-09-01
13:34:30.000000000 +0200
+++ new/yast2-bootloader-2.17.46/src/grub/Makefile.in 2008-12-08
15:42:53.000000000 +0100
@@ -207,8 +207,7 @@
ystartupdir = @ystartupdir@
ynclude_DATA = \
helps.ycp \
- misc.ycp \
- trusted_grub_edit.ycp
+ misc.ycp
EXTRA_DIST = \
$(ynclude_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-bootloader-2.17.45/src/grub/trusted_grub_edit.ycp
new/yast2-bootloader-2.17.46/src/grub/trusted_grub_edit.ycp
--- old/yast2-bootloader-2.17.45/src/grub/trusted_grub_edit.ycp 2008-09-12
13:03:43.000000000 +0200
+++ new/yast2-bootloader-2.17.46/src/grub/trusted_grub_edit.ycp 1970-01-01
01:00:00.000000000 +0100
@@ -1,399 +0,0 @@
-{
-
-textdomain "bootloader";
-
-import "CWM";
-import "Label";
-import "BootCommon";
-import "Popup";
-
-include "bootloader/grub/helps.ycp";
-
-
-/**
- * Init function of widget
- * @param widget string id of the widget
- */
-
-void InitMeasuresTable(string widget)
-{
- if (BootCommon::current_section["type"]:"" != "other")
- {
- map <string, string> meas = BootCommon::current_section["measure"]:$[];
- list measures = [];
-
- foreach(string file, string pcr, meas, {
- measures = add(measures, `item(`id(file), file, pcr));
- });
-
- UI::ChangeWidget (`id (`measures), `Items, measures);
- } else {
- UI::ChangeWidget (`id (`measures), `Enabled, false);
- UI::ChangeWidget (`id (`add), `Enabled, false);
- UI::ChangeWidget (`id (`edit), `Enabled, false);
- UI::ChangeWidget (`id (`delete), `Enabled, false);
- }
-}
-
-
-
-void AddEditMeasure (string file, string pcr)
-{
- map <string, string> meas = BootCommon::current_section["measure"]:$[];
- string orig_file = file;
- any ret = nil;
-
- if (pcr == "")
- pcr ="8";
-
- UI::OpenDialog( (file != "") ? `Label( _("Edit Measure")): `Label( _("Add
New Measure") ),
- `VBox(
- `HBox(
- `InputField(`id(`measur), _("Measure File"), file),
- `VBox ( `Label(""),
- `PushButton(`id(`br), Label::BrowseButton())
- )
- ),
- `Left(`IntField(`id(`pcr), _("PCR Index of File"),0, 100,
tointeger(pcr))),
- `HBox(
- `PushButton(`id(`cancel), Label::CancelButton()),
- `PushButton(`id(`ok), Label::OKButton())
- )
- )
- ); // end of UI::OpenDialog(
-
- while (true) {
- ret = UI::UserInput();
- if (ret == `br) {
- string val = UI::AskForExistingFile ("/","*.*",_("Please Select
File"));
- UI::ChangeWidget(`id(`measur), `Value, val);
- } else if ( ret == `ok ) {
- string new_file = tostring(UI::QueryWidget(`id(`measur), `Value));
- string new_pcr = tostring(UI::QueryWidget(`id(`pcr), `Value));
- if (file != "")
- {
- meas = remove(meas, file);
- }
- meas[new_file] = new_pcr;
- break;
- } else if (ret == `cancel) {
- break;
- }
- };
- BootCommon::current_section["measure"] = meas;
-
- UI::CloseDialog();
-}
-
-/**
- * Handle function of a widget
- * @param widget string widget key
- * @param event map event description of event that occured
- * @return symbol to return to wizard sequencer, or nil
- */
-symbol HandleMeasuresTable (string widget, map event)
-{
-
- any op = event["ID"]:nil;
- if (event["ID"]:nil == `measures
- && event["EventReason"]:"" == "Activated"
- && event["EventType"]:"" == "WidgetEvent")
- {
- op = `edit;
- }
- map <string, string> meas = BootCommon::current_section["measure"]:$[];
-
- string current = (string)UI::QueryWidget (`id (`measures), `CurrentItem);
- string act_file = "";
- string act_pcr = "";
-
- if ((current != nil) && (current != ""))
- {
- act_file = current;
- act_pcr = meas[current]:"";
- }
- if (op == `add)
- {
- AddEditMeasure("", "");
- InitMeasuresTable(widget);
- } else if (op == `edit) {
-
- AddEditMeasure(act_file, act_pcr);
- InitMeasuresTable(widget) ;
- } else if (op == `delete) {
- string message = sformat(_("Really delete measured file: %1 with PCR:
%2 ?"), act_file, act_pcr);
- if (Popup::YesNo(message))
- {
- meas = remove(meas,act_file);
- BootCommon::current_section["measure"] = meas;
- InitMeasuresTable(widget);
- }
- }
-
-}
-/**
- * Store function of a widget
- * @param widget string widget key
- * @param event map event that caused the operation
- */
-void StoreMeasuresTable (string widget, map event)
-{
- if ((size(BootCommon::current_section["measure"]:$[]) == 0) &&
- (haskey(BootCommon::current_section, "measure")))
- BootCommon::current_section = remove(BootCommon::current_section,
"measure");
-}
-
-/**
- * Init function of widget
- * @param widget string id of the widget
- */
-
-void InitPCRKernel (string widget) {
- if ((BootCommon::current_section["type"]:"" == "image") ||
(BootCommon::current_section["type"]:"" == "xen"))
- {
- UI::ChangeWidget (`id ("PCRKernel"), `Enabled, true);
- UI::ChangeWidget (`id ("PCRKernel"), `Value,
tointeger(BootCommon::current_section["imagepcr"]:"8"));
- } else {
- UI::ChangeWidget (`id ("PCRKernel"), `Enabled, false);
- }
-}
-
-
-/**
- * Store function of a widget
- * @param widget string widget key
- * @param event map event that caused the operation
- */
-void StorePCRKernel (string widget, map event) {
- if ((BootCommon::current_section["type"]:"" == "image") ||
- (BootCommon::current_section["type"]:"" == "xen"))
- BootCommon::current_section["imagepcr"] = tostring(UI::QueryWidget (`id
("PCRKernel"), `Value));
-}
-
-/**
- * Init function of widget
- * @param widget string id of the widget
- */
-
-void InitPCRInitrd (string widget) {
- if ((BootCommon::current_section["type"]:"" == "image") ||
(BootCommon::current_section["type"]:"" == "xen"))
- {
- UI::ChangeWidget (`id ("PCRInitrd"), `Enabled, true);
- UI::ChangeWidget (`id ("PCRInitrd"), `Value,
tointeger(BootCommon::current_section["initrdpcr"]:"8"));
- } else {
- UI::ChangeWidget (`id ("PCRInitrd"), `Enabled, false);
- }
-}
-
-
-/**
- * Store function of a widget
- * @param widget string widget key
- * @param event map event that caused the operation
- */
-void StorePCRInitrd (string widget, map event) {
- if ((BootCommon::current_section["type"]:"" == "image") ||
- (BootCommon::current_section["type"]:"" == "xen"))
- BootCommon::current_section["initrdpcr"] = tostring(UI::QueryWidget
(`id ("PCRInitrd"), `Value));
-}
-
-
-
-/**
- * Init function of widget
- * @param widget string id of the widget
- */
-
-void InitPCRChainloader (string widget) {
- if (BootCommon::current_section["type"]:"" != "other")
- UI::ChangeWidget (`id ("PCRChainloader"), `Enabled, false);
- else
- UI::ChangeWidget (`id ("PCRChainloader"), `Value,
tointeger(BootCommon::current_section["chainloaderpcr"]:"8"));
-}
-
-
-/**
- * Store function of a widget
- * @param widget string widget key
- * @param event map event that caused the operation
- */
-void StorePCRChainloader (string widget, map event) {
- if (BootCommon::current_section["type"]:"" == "other")
- BootCommon::current_section["chainloaderpcr"] =
tostring(UI::QueryWidget (`id ("PCRChainloader"), `Value));
-}
-
-/**
- * Init function of widget
- * @param widget string id of the widget
- */
-
-void InitPCRXen (string widget) {
- if (BootCommon::current_section["type"]:"" != "xen")
- UI::ChangeWidget (`id ("PCRXen"), `Enabled, false);
- else
- UI::ChangeWidget (`id ("PCRXen"), `Value,
tointeger(BootCommon::current_section["xenpcr"]:"8"));
-}
-
-
-/**
- * Store function of a widget
- * @param widget string widget key
- * @param event map event that caused the operation
- */
-void StorePCRXen (string widget, map event) {
- if (BootCommon::current_section["type"]:"" == "xen")
- BootCommon::current_section["xenpcr"] = tostring(UI::QueryWidget (`id
("PCRXen"), `Value));
-}
-
-
-map<string,map<string,any> > wid_handling = $[
-
-
- "MeasuresTable" : $[
- //TRANSLATORS: RadioButtonGroup Label
- "label" : _("Measurement of Grub"),
- "widget" : `custom,
- "custom_widget" : `VBox(`Frame (_("Measures"),
- `HBox (`HSpacing (2), `VBox (
- `VSpacing (1),
- `Table (`id (`measures),
- `opt (`keepSorting, `notify),
- `header (
- // table header, Measure
- _("Measure"),
- // table header, PCR
- _("PCR")
- ), []
- ),
-
- `HBox (
- `HStretch (),
- `PushButton (`id (`add), `opt (`key_F3),
Label::AddButton ()),
- `PushButton (`id (`edit), `opt(`key_F5),
Label::EditButton ()),
- `PushButton (`id (`delete), `opt(`key_F5),
Label::DeleteButton ()),
- `HStretch ()
- ),
- `VSpacing (1)
- )
-
- )
- )),
- "init" : InitMeasuresTable,
- "handle" : HandleMeasuresTable,
- "store" : StoreMeasuresTable,
- "help" : grub_help_messages["MeasuresTableHelp"]:"",
-
- ],
-
- "PCRKernel" : $[
- //TRANSLATORS: IntField Label
- "label" : _("PCR Index of &Kernel"),
- "widget" : `intfield,
- "minimum" : 0,
- "maximum" : 100,
- "init" : InitPCRKernel,
- //"handle" :
- "store" : StorePCRKernel,
- "help" : grub_help_messages["PCRKernelHelp"]:"",
- ],
-
-
-
- "PCRInitrd" : $[
- //TRANSLATORS: IntField Label
- "label" : _("PCR Index of &Initrd"),
- "widget" : `intfield,
- "minimum" : 0,
- "maximum" : 100,
- "init" : InitPCRInitrd,
- //"handle" :
- "store" : StorePCRInitrd,
- "help" : grub_help_messages["PCRInitrdHelp"]:"",
- ],
-
- "PCRXen" : $[
- //TRANSLATORS: IntField Label
- "label" : _("PCR Index of &XEN"),
- "widget" : `intfield,
- "minimum" : 0,
- "maximum" : 100,
- "init" : InitPCRXen,
- //"handle" :
- "store" : StorePCRXen,
- "help" : grub_help_messages["PCRXenHelp"]:"",
- ],
-
- "PCRChainloader" : $[
- //TRANSLATORS: IntField Label
- "label" : _("PCR &Index of Chainloader"),
- "widget" : `intfield,
- "minimum" : 0,
- "maximum" : 100,
- "init" : InitPCRChainloader,
- //"handle" :
- "store" : StorePCRChainloader,
- "help" : grub_help_messages["PCRChainloaderHelp"]:"",
- ],
-
-];
-
-
-
-
-symbol TrustedGrubDetails () {
- y2milestone ("Running i386 loader details dialog");
-
- term contents = `HBox (`HSpacing (2), `VBox (
- "MeasuresTable",
- `VSpacing (1),
- "PCRKernel",
- `VSpacing (1),
- "PCRInitrd",
- `VSpacing (1),
- "PCRXen",
- `VSpacing (1),
- "PCRChainloader",
- `VStretch ()
- ), `HSpacing (2));
-
- list<string> widget_names = ["MeasuresTable", "PCRKernel", "PCRInitrd",
"PCRXen", "PCRChainloader",];
- map<string,map<string,any> > widget_descr = wid_handling;
- // dialog caption
- string caption = _("Trusted GRUB Options");
- return CWM::ShowAndRun ($[
- "widget_descr" : widget_descr,
- "widget_names" : widget_names,
- "contents" : contents,
- "caption" : caption,
- "back_button" : Label::BackButton (),
- "abort_button" : Label::CancelButton (),
- "next_button" : Label::OKButton (),
- ]);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/modules/BootELILO.ycp
new/yast2-bootloader-2.17.46/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.17.45/src/modules/BootELILO.ycp 2008-11-21
12:11:23.000000000 +0100
+++ new/yast2-bootloader-2.17.46/src/modules/BootELILO.ycp 2008-12-11
17:50:12.000000000 +0100
@@ -17,7 +17,7 @@
* Olaf Dabrunz <od@xxxxxxx>
* Philipp Thomas <pth@xxxxxxx>
*
- * $Id: BootELILO.ycp 53502 2008-11-21 11:11:22Z juhliarik $
+ * $Id: BootELILO.ycp 54071 2008-12-11 16:50:11Z juhliarik $
*
*/
@@ -346,6 +346,9 @@
BootCommon::globals["boot_efilabel"] = Product::name;
}
+ if (Mode::installation())
+ BootCommon::UpdateProposalFromClient();
+
y2milestone ("EFI entry name: %1",
BootCommon::globals["boot_efilabel"]:"");
y2milestone ("Proposed sections: %1", BootCommon::sections);
y2milestone ("Proposed globals: %1", BootCommon::globals);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/modules/BootGRUB.ycp
new/yast2-bootloader-2.17.46/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.17.45/src/modules/BootGRUB.ycp 2008-12-02
15:37:09.000000000 +0100
+++ new/yast2-bootloader-2.17.46/src/modules/BootGRUB.ycp 2008-12-11
17:50:12.000000000 +0100
@@ -15,7 +15,7 @@
* Olaf Dabrunz <od@xxxxxxx>
* Philipp Thomas <pth@xxxxxxx>
*
- * $Id: BootGRUB.ycp 53822 2008-12-02 14:37:09Z juhliarik $
+ * $Id: BootGRUB.ycp 54071 2008-12-11 16:50:11Z juhliarik $
*
*/
@@ -63,7 +63,6 @@
include "bootloader/grub/helps.ycp";
include "bootloader/generic/device_map_edit_widget.ycp";
include "bootloader/generic/dialogs.ycp";
-include "bootloader/grub/trusted_grub_edit.ycp";
// end of mandatory functions
//----------------------------------------------------------------------------
@@ -619,6 +618,9 @@
// FATE #301994: Correct device mapping in case windows is installed
on the second HD
BootCommon::sections = checkWindowsSection(BootCommon::sections);
+ if (Mode::installation())
+ BootCommon::UpdateProposalFromClient();
+
BootCommon::isTrustedGrub ();
y2milestone ("Proposed sections: %1", BootCommon::sections);
y2milestone ("Proposed globals: %1", BootCommon::globals);
@@ -771,7 +773,6 @@
return $[
"installation" : i386InstallDetailsDialog,
"loader" : genericBootLoaderOptionsDialog,
- "trusted_grub" : TrustedGrubDetails,
];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/modules/Bootloader.ycp
new/yast2-bootloader-2.17.46/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.17.45/src/modules/Bootloader.ycp 2008-11-27
18:54:51.000000000 +0100
+++ new/yast2-bootloader-2.17.46/src/modules/Bootloader.ycp 2008-12-11
17:50:12.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: Bootloader.ycp 53673 2008-11-27 17:54:50Z juhliarik $
+ * $Id: Bootloader.ycp 54071 2008-12-11 16:50:11Z juhliarik $
*
*/
@@ -785,6 +785,43 @@
}
+/** bnc #450153 YaST bootloader doesn't handle kernel from add-on products in
installation
+ * Remove all section with empty keys "image" and "initrd"
+ *
+ */
+void removeDummySections ()
+{
+ BootCommon::sections=filter(map<string,any> section,
BootCommon::sections,
+ {
+ if ((section["original_name"]:"" == "linux")
+ || (section["original_name"]:"" == "failsafe"))
+ {
+ if ((search(section["image"]:"", "dummy_image") != nil)
&&
+ (search(section["initrd"]:"", "dummy_initrd") !=
nil))
+ {
+ y2milestone("Removed dummy boot section: %1",
section);
+ return false;
+ } else
+ return true;
+ }
+ return true;
+ });
+}
+
+/** bnc #450153 YaST bootloader doesn't handle kernel from add-on products in
installation
+ * Function check if client kernel_bl_proposal exist
+ *
+ * @return boolean true on success
+ */
+
+boolean CheckClientForSLERT()
+{
+ if (WFM::ClientExists("kernel_bl_proposal"))
+ return true;
+ else
+ return false;
+}
+
/**
* Find "same" boot sections and return numbers of sections
* from BootCommon::sections
@@ -808,8 +845,7 @@
y2milestone("Number of similar section is %2 with %1",find_section,
num_sections);
return num_sections;
-}
-
+}
/**
* Delete duplicated boot sections from
@@ -818,6 +854,12 @@
global define void DelDuplicatedSections()
{
+
+ if (CheckClientForSLERT())
+ {
+ removeDummySections ();
+ return;
+ }
y2milestone("Deleting duplicated boot sections");
map<string,any> linux_default = BootCommon::CreateLinuxSection
("linux");
map<string,any> linux_failsafe = BootCommon::CreateLinuxSection
("failsafe");
@@ -849,9 +891,9 @@
||(section["description"]:"" == linux_xen["name"]:nil))
&& (num_linux_xen > 1)))
{
- if ((section["root"]:nil == linux_default["root"]:nil)
+ if (((section["root"]:nil == linux_default["root"]:nil)
||(section["root"]:nil == linux_failsafe["root"]:nil)
- ||(section["root"]:nil == linux_xen["root"]:nil))
+ ||(section["root"]:nil == linux_xen["root"]:nil)))
{
if (section["original_name"]:"" == "failsafe")
num_linux_failsafe = num_linux_failsafe
-1;
@@ -870,9 +912,10 @@
} else {
return true;
- };
+ };
return true;
});
+
ResolveSymlinksInSections();
FindAndSelectDefault(linux_default);
y2milestone("Boot sections AFTER deleting: %1", BootCommon::sections);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/modules/BootPOWERLILO.ycp
new/yast2-bootloader-2.17.46/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.17.45/src/modules/BootPOWERLILO.ycp 2008-11-27
16:46:15.000000000 +0100
+++ new/yast2-bootloader-2.17.46/src/modules/BootPOWERLILO.ycp 2008-12-11
17:50:12.000000000 +0100
@@ -1,4 +1,3 @@
-
/**
* File:
* modules/BootPOWERLILO.ycp
@@ -16,7 +15,7 @@
* Olaf Dabrunz <od@xxxxxxx>
* Philipp Thomas <pth@xxxxxxx>
*
- * $Id: BootPOWERLILO.ycp 53661 2008-11-27 15:46:15Z juhliarik $
+ * $Id: BootPOWERLILO.ycp 54071 2008-12-11 16:50:11Z juhliarik $
*
*/
@@ -710,6 +709,56 @@
y2milestone ("Base source: %1", base_source);
}
+/** bnc #439674 Autoyast install of Cell blades fails to install bootloader
+ * The function update global settings for bootloader
+ * if there is used autoyast The basic problem is that there is missing
+ * boot_* , timeout etc.
+ * If there missing necessary information they will be added
+ *
+ */
+void UpdateGlobalsInAutoInst()
+{
+ if (!haskey(BootCommon::globals, "timeout"))
+ BootCommon::globals["timeout"] = "80";
+
+ if (!haskey(BootCommon::globals, "activate"))
+ BootCommon::globals["activate"] = "true";
+
+ // if there missing boot_* -> then propose it
+ if ((!haskey(BootCommon::globals, "boot_chrp_custom")) &&
+ (!haskey(BootCommon::globals, "boot_prep_custom")) &&
+ (!haskey(BootCommon::globals, "boot_pmac_custom")) &&
+ (!haskey(BootCommon::globals, "boot_iseries_custom")))
+ {
+ string arch = getBoardType ();
+ switch(arch) {
+ case ("prep"):
+ BootCommon::globals["boot_prep_custom"] =
BootCommon::BootPartitionDevice;
+ break;
+
+ case ("pmac"):
+ BootCommon::globals["boot_pmac_custom"] =
BootCommon::BootPartitionDevice;
+ break;
+
+ case ("iseries"):
+ BootCommon::globals["boot_slot"] = "B";
+ BootCommon::globals["boot_file"] =
"/tmp/suse_linux_image";
+
+ if (BootCommon::BootPartitionDevice != nil &&
+ BootCommon::BootPartitionDevice != "")
+ {
+
BootCommon::globals["boot_iseries_custom"] = BootCommon::BootPartitionDevice;
+ }
+ break;
+ default:
+ BootCommon::globals["boot_chrp_custom"] =
BootCommon::BootPartitionDevice;
+ break;
+ }
+
+ }
+
+}
+
// general functions
/**
@@ -764,6 +813,8 @@
if (Mode::autoinst ())
{
y2debug ("Nothing to do in AI mode if sections exist");
+ // bnc #439674 Autoyast install of Cell blades fails to install
bootloader
+ UpdateGlobalsInAutoInst();
}
else
BootCommon::FixSections (BootPOWERLILO::CreateSections);
@@ -799,8 +850,8 @@
*/
global define map Export () {
map exp = $[
- "global": BootCommon::globals,
- "sections" : BootCommon::sections,
+ "global": BootCommon::remapGlobals(BootCommon::globals),
+ "sections" : BootCommon::remapSections(BootCommon::sections),
"activate" : BootCommon::activate,
];
return exp;
@@ -890,7 +941,7 @@
// convert
map<string,string> my_globals = mapmap (string k , string v,
BootCommon::globals, {
- if ((k == "stage1_dev") || (regexpmatch(k, "^boot_.*custom$" )) || (k
== "boot_chrp_custom"))
+ if ((k == "stage1_dev") || (regexpmatch(k, "^boot_.*custom$" )))
return $[k : BootCommon::Dev2MountByDev(v)];
else
return $[k : v];
@@ -902,6 +953,10 @@
// partitions in 'boot_<arch>_custom' and 'clone' (chrp)
// ret = ret && BootCommon::SetDeviceMap (device_mapping);
+
+ // bnc #450506 root=kernelname in lilo.conf after upgrade
+ BootCommon::sections = BootCommon::remapSections(BootCommon::sections);
+
ret = ret && BootCommon::SetSections (BootCommon::sections);
ret = ret && BootCommon::SetGlobal (my_globals);
if (flush)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/src/routines/misc.ycp
new/yast2-bootloader-2.17.46/src/routines/misc.ycp
--- old/yast2-bootloader-2.17.45/src/routines/misc.ycp 2008-12-04
09:35:12.000000000 +0100
+++ new/yast2-bootloader-2.17.46/src/routines/misc.ycp 2008-12-11
17:50:12.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: misc.ycp 53862 2008-12-04 08:35:11Z juhliarik $
+ * $Id: misc.ycp 54071 2008-12-11 16:50:11Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
@@ -36,6 +36,7 @@
import "ProductFeatures";
import "Directory";
import "Installation";
+ import "FileUtils";
// bootloader attributes handling functions
@@ -216,11 +217,11 @@
path_partitions[dev_by_something]=
p["device"]:"";
}
- // map partition by path
+ // map partition by label
if ((p["label"]:nil != "") && (p["label"]:nil != nil))
{
dev_by_something =
"/dev/disk/by-label/"+p["label"]:"";
- label_partitions[dev_by_something]=
p["device"]:"";
+ label_partitions[dev_by_something]=
p["device"]:"";
}
// map disk by id
@@ -366,6 +367,25 @@
globals_set["boot_custom"] =
BootCommon::MountByDev2Dev(globals_set["boot_custom"]:"");
}
+ if (haskey(globals_set, "boot_chrp_custom"))
+ {
+ globals_set["boot_chrp_custom"] =
BootCommon::MountByDev2Dev(globals_set["boot_chrp_custom"]:"");
+ }
+
+ if (haskey(globals_set, "boot_pmac_custom"))
+ {
+ globals_set["boot_pmac_custom"] =
BootCommon::MountByDev2Dev(globals_set["boot_pmac_custom"]:"");
+ }
+
+ if (haskey(globals_set, "boot_iseries_custom"))
+ {
+ globals_set["boot_iseries_custom"] =
BootCommon::MountByDev2Dev(globals_set["boot_iseries_custom"]:"");
+ }
+
+ if (haskey(globals_set, "boot_prep_custom"))
+ {
+ globals_set["boot_prep_custom"] =
BootCommon::MountByDev2Dev(globals_set["boot_prep_custom"]:"");
+ }
return globals_set;
}
@@ -2197,7 +2217,9 @@
string xen_measure = "";
string xenpcr = "";
string xen_kernel_append = "";
-
+ string addon_name = "";
+ string addon_append = "";
+ string addon_vga = "";
boolean xen_set = false;
// default boot section is not found
@@ -2278,6 +2300,14 @@
failsafe_append = s["append"]:"";
console = writeConsoleToSysconf(s["console"]:"");
}
+
+ if (s["__rt_kernel"]:"" == "true")
+ {
+ addon_name = s["name"]:"";
+ addon_append = s["append"]:"";
+ addon_vga = s["vgamode"]:"";
+ }
+
});
if (! xen_set)
@@ -2334,6 +2364,15 @@
if (xen_measure != "")
SCR::Write (add(sys_agent,.XEN_MEASURE), xen_measure);
+ if (addon_name != "")
+ SCR::Write (add(sys_agent,.RT_NAME), addon_name);
+
+ if (addon_vga != "")
+ SCR::Write (add(sys_agent,.RT_VGA), addon_vga);
+
+ if (addon_append != "")
+ SCR::Write (add(sys_agent,.RT_APPEND), addon_append);
+
SCR::Write (sys_agent, nil);
@@ -2588,5 +2627,37 @@
return ret;
}
+/** bnc #450153 - support for installation kernel from add-on
+ * fucntion call client from add-on and update proposal for
+ * yast2-bootloader. -> availabe edit kernel args for kernel
+ * from add-on
+ *
+ * @return boolean - true on success
+ */
+global boolean UpdateProposalFromClient ()
+{
+ boolean ret = true;
+ string client_file = "kernel_bl_proposal";
+ if ((!Arch::i386()) && (!Arch::x86_64()))
+ {
+ y2milestone("Unsuported architecture... for adding SLERT
addon");
+ return ret;
+ }
+
+ if (WFM::ClientExists(client_file))
+ {
+ y2milestone("Client: %1 was found", client_file);
+ WFM::CallFunction (client_file, []);
+
+ } else {
+ y2milestone("File %1 doesn't exist - proposal will not be
updated", client_file);
+ }
+
+ return ret;
+}
+
+
+
+
} //end of include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-bootloader-2.17.45/src/routines/section_widgets.ycp
new/yast2-bootloader-2.17.46/src/routines/section_widgets.ycp
--- old/yast2-bootloader-2.17.45/src/routines/section_widgets.ycp
2008-12-01 18:27:07.000000000 +0100
+++ new/yast2-bootloader-2.17.46/src/routines/section_widgets.ycp
2008-12-08 15:35:20.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: section_widgets.ycp 53790 2008-12-01 17:27:06Z juhliarik $
+ * $Id: section_widgets.ycp 53957 2008-12-07 13:43:38Z juhliarik $
*
*/
@@ -331,46 +331,8 @@
}
-/**
- * Init function of widget
- * @param widget any id of the widget
- */
-void InitTrustedDetails (string widget) {
-
- if (BootCommon::globals["trusted_grub"]:"" != "true")
- UI::ChangeWidget (`id ("trusted"), `Enabled, false);
-
-}
-
-
/**
- * Handle function of a widget
- * @param widget string widget key
- * @param event map event description of event that occured
- * @return symbol to return to wizard sequencer, or nil
- */
-symbol TrustedDetailsButtonHandle (string widget, map event) {
-
- string lt = Bootloader::getLoaderType ();
- if (lt == "none" || lt == "default")
- {
- NoLoaderAvailable ();
- return nil;
- }
-
- return `trusted_details;
-}
-/**
- * Store function of the root device widget
- * @param widget any widget key
- * @param event map event description of event that occured
- */
-void StoreTrustedDetails (string widget, map event) {
- y2debug("Fake store function for trusted GRUB");
-
-}
-/**
* Cache for CommonSectionWidgets
*/
map<string,map<string,any> > _common_section_widgets = nil;
@@ -492,17 +454,6 @@
];
}
- _common_section_widgets["trusted"] = $[
- "widget" : `push_button,
- // push button
- "label" : _("&Trusted GRUB Details"),
- "init" : InitTrustedDetails,
- "handle" : TrustedDetailsButtonHandle,
- "handle_events" : [ "trusted" ],
- "store" : StoreTrustedDetails,
- "help" : TrustedGrubHelp (),
- ];
-
return _common_section_widgets;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.45/VERSION
new/yast2-bootloader-2.17.46/VERSION
--- old/yast2-bootloader-2.17.45/VERSION 2008-12-03 10:04:16.000000000
+0100
+++ new/yast2-bootloader-2.17.46/VERSION 2008-12-08 15:42:44.000000000
+0100
@@ -1 +1 @@
-2.17.45
+2.17.46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |