Author: juhliarik
Date: Tue Apr 22 13:05:45 2008
New Revision: 46945
URL: http://svn.opensuse.org/viewcvs/yast?rev=46945&view=rev
Log:
added fix for bnc#363254
Modified:
branches/tmp/juhliarik/SP3/bootloader/src/clients/bootloader_proposal.ycp
branches/tmp/juhliarik/SP3/bootloader/src/modules/Bootloader.ycp
branches/tmp/juhliarik/SP3/bootloader/src/routines/dialogs.ycp
Modified: branches/tmp/juhliarik/SP3/bootloader/src/clients/bootloader_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/SP3/bootloader/src/clients/bootloader_proposal.ycp?rev=46945&r1=46944&r2=46945&view=diff
==============================================================================
--- branches/tmp/juhliarik/SP3/bootloader/src/clients/bootloader_proposal.ycp (original)
+++ branches/tmp/juhliarik/SP3/bootloader/src/clients/bootloader_proposal.ycp Tue Apr 22 13:05:45 2008
@@ -97,13 +97,16 @@
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 +117,7 @@
}
y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
-//F#300779 - end
+ // F#300779 - end
if (Bootloader::getLoaderType () == "")
{
y2error ("No bootloader selected");
Modified: branches/tmp/juhliarik/SP3/bootloader/src/modules/Bootloader.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/SP3/bootloader/src/modules/Bootloader.ycp?rev=46945&r1=46944&r2=46945&view=diff
==============================================================================
--- branches/tmp/juhliarik/SP3/bootloader/src/modules/Bootloader.ycp (original)
+++ branches/tmp/juhliarik/SP3/bootloader/src/modules/Bootloader.ycp Tue Apr 22 13:05:45 2008
@@ -279,11 +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 +298,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 +526,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 +544,7 @@
}
-//F#300779 -end
+ // F#300779 -end
// update graphics menu where possible
UpdateGfxMenu ();
Modified: branches/tmp/juhliarik/SP3/bootloader/src/routines/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/SP3/bootloader/src/routines/dialogs.ycp?rev=46945&r1=46944&r2=46945&view=diff
==============================================================================
--- branches/tmp/juhliarik/SP3/bootloader/src/routines/dialogs.ycp (original)
+++ branches/tmp/juhliarik/SP3/bootloader/src/routines/dialogs.ycp Tue Apr 22 13:05:45 2008
@@ -86,13 +86,17 @@
"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 +104,8 @@
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