Author: juhliarik
Date: Thu Jul 10 14:35:52 2008
New Revision: 48961
URL: http://svn.opensuse.org/viewcvs/yast?rev=48961&view=rev
Log:
- added fix for problem with detection /boot partiotion like NFS (bnc
#404562)
- added support for installing GRUB on XEN (bnc #380982)
M src/clients/bootloader_proposal.ycp
M src/modules/Bootloader.ycp
M src/routines/dialogs.ycp
* problem with detection /boot partition
M src/modules/BootCommon.ycp
* problem with installing GRUB on XEN
Modified:
branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_proposal.ycp
branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp
branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp
branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/dialogs.ycp
Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_proposal.ycp?rev=48961&r1=48960&r2=48961&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_proposal.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/clients/bootloader_proposal.ycp Thu Jul 10 14:35:52 2008
@@ -97,13 +97,18 @@
ret = $[ "raw_proposal" : Bootloader::Summary ()];
-//F#300779 - Install diskless client (NFS-root)
-//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+ // 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
+ // B#355332 - Bootloader doesn't work if root partitions is like nfs
- map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+ map dev = $[];
+ if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
+ dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+ else
+ dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
+
if (dev["disk"]:"" == "/dev/nfs")
{
@@ -114,7 +119,7 @@
}
y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
-//F#300779 - end
+ // F#300779 - end
if (Bootloader::getLoaderType () == "")
{
y2error ("No bootloader selected");
Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp?rev=48961&r1=48960&r2=48961&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp Thu Jul 10 14:35:52 2008
@@ -918,8 +918,12 @@
y2milestone ("Bootloader detection returned %1", loader_type);
if (Arch::is_uml () || Arch::is_xenU())
{
- y2milestone ("Not installing any bootloader for UML/Xen PV");
- loader_type = "none";
+ //y2milestone ("Not installing any bootloader for UML/Xen PV");
+ //loader_type = "none";
+ // bnc #380982 - pygrub cannot boot kernel
+ // added installation of bootloader
+ y2milestone ("It is XEN domU and the bootloader should be installed");
+
}
if (loader_type == "grub" && Storage::UseLilo())
{
Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp?rev=48961&r1=48960&r2=48961&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp Thu Jul 10 14:35:52 2008
@@ -279,12 +279,16 @@
global define list<string> Summary () {
list<string> ret =[];
-//F#300779 - Install diskless client (NFS-root)
-//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+ // 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);
-
+ // B#355332 - Bootloader doesn't work if root partitions is like nfs
+
+ map dev = $[];
+ if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
+ dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+ else
+ dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
if (dev["disk"]:"" == "/dev/nfs")
{
@@ -293,7 +297,7 @@
return ret;
}
-//F#300779 - end
+ // F#300779 - end
ret = blSummary ();
// check if default section was changed or not
string main_section = getProposedDefaultSection ();
@@ -521,12 +525,16 @@
}
-//F#300779 - Install diskless client (NFS-root)
-//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+ // 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
+ // B#355332 - Bootloader doesn't work if root partitions is like nfs
- map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+ map dev = $[];
+ if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
+ dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+ else
+ dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
if (dev["disk"]:"" == "/dev/nfs")
{
@@ -535,7 +543,7 @@
}
-//F#300779 -end
+ // F#300779 -end
// update graphics menu where possible
UpdateGfxMenu ();
Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/dialogs.ycp?rev=48961&r1=48960&r2=48961&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/dialogs.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/dialogs.ycp Thu Jul 10 14:35:52 2008
@@ -86,13 +86,16 @@
"tab",
`Right ("adv_button")
);
-//F#300779 - Install diskless client (NFS-root)
-//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+ // 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
+ // B#355332 - Bootloader doesn't work if root partitions is like nfs
-
- map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+ map dev = $[];
+ if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
+ dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
+ else
+ dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
if ((dev["disk"]:"" == "/dev/nfs") && (Mode::installation()))
{
@@ -100,7 +103,7 @@
y2milestone("dialogs::MainDialog() -> Boot partition is nfs type, bootloader will not be installed.");
return `next;
}
-//F#300779: end
+ // F#300779: end
list<string> widget_names = ["tab", "adv_button"];
map