Author: juhliarik
Date: Tue Jan 22 17:46:49 2008
New Revision: 43835
URL: http://svn.opensuse.org/viewcvs/yast?rev=43835&view=rev
Log:
added patch for bug#355332 Bootloader doesn't work if root partitions is like
nfs
Modified:
branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp
branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp
branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp
Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp?rev=43835&r1=43834&r2=43835&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp Tue Jan 22 17:46:49 2008
@@ -97,15 +97,24 @@
ret = $[ "raw_proposal" : Bootloader::Summary ()];
-//FIXME kokso: added check for root device if root device == NFS -> stop installing bootloader
- if (BootCommon::BootPartitionDevice == "/dev/nfs")
+//F#300779 - Install diskless client (NFS-root)
+//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+
+//B#355332 - Bootloader doesn't work if root partitions is like nfs
+
+ map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+
+ if (dev["disk"]:"" == "/dev/nfs")
{
- y2milestone("bootlader_proposal - MakeProposal: Boot partition is nfs type, bootloader will not be installed.");
+ y2milestone("bootlader_proposal::MakeProposal -> Boot partition is nfs type, bootloader will not be installed.");
+ y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
return ret;
}
+ y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
+//F#300779 - end
if (Bootloader::getLoaderType () == "")
{
y2error ("No bootloader selected");
Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp?rev=43835&r1=43834&r2=43835&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp Tue Jan 22 17:46:49 2008
@@ -278,16 +278,22 @@
*/
global define list<string> Summary () {
list<string> ret =[];
-//FIXME kokso: added check for root device if root device == NFS -> stop installing bootloader
- if (BootCommon::BootPartitionDevice == "/dev/nfs")
+
+//F#300779 - Install diskless client (NFS-root)
+//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+
+//B#355332 - Bootloader doesn't work if root partitions is like nfs
+ map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+
+ if (dev["disk"]:"" == "/dev/nfs")
{
ret = add (ret, _("The boot partition is of type NFS. Bootloader cannot be installed."));
- y2milestone("Bootloader::Summary Boot partition is nfs type, bootloader will not be installed.");
+ y2milestone("Bootloader::Summary() -> Boot partition is nfs type, bootloader will not be installed.");
return ret;
}
-
+//F#300779 - end
ret = blSummary ();
// check if default section was changed or not
string main_section = getProposedDefaultSection ();
@@ -514,15 +520,22 @@
return ret;
}
-//FIXME kokso: added check for root device if root device == NFS -> stop installing bootloader
- if (BootCommon::BootPartitionDevice == "/dev/nfs")
+
+//F#300779 - Install diskless client (NFS-root)
+//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+
+//B#355332 - Bootloader doesn't work if root partitions is like nfs
+
+ map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+
+ if (dev["disk"]:"" == "/dev/nfs")
{
- y2milestone("Boot partition is nfs type, bootloader will not be installed.");
+ y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed.");
return ret;
}
-
+//F#300779 -end
// update graphics menu where possible
UpdateGfxMenu ();
Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp?rev=43835&r1=43834&r2=43835&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp Tue Jan 22 17:46:49 2008
@@ -27,6 +27,7 @@
import "Wizard";
import "Bootloader";
import "Stage";
+import "Storage";
include "bootloader/routines/popups.ycp";
include "bootloader/routines/section_widgets.ycp";
@@ -85,12 +86,22 @@
"tab",
`Right ("adv_button")
);
-//FIXME kokso: additional warning that root partition is nfs type -> bootloader will not be installed
- if ((BootCommon::BootPartitionDevice == "/dev/nfs") && (Mode::installation()))
+//F#300779 - Install diskless client (NFS-root)
+//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+
+//B#355332 - Bootloader doesn't work if root partitions is like nfs
+
+
+ map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+
+ if ((dev["disk"]:"" == "/dev/nfs") && (Mode::installation()))
{
Popup::Message(_("The boot partition is of type NFS. Bootloader cannot be installed."));
+ y2milestone("dialogs::MainDialog() -> Boot partition is nfs type, bootloader will not be installed.");
return `next;
- }
+ }
+//F#300779: end
+
list<string> widget_names = ["tab", "adv_button"];
map