Author: juhliarik Date: Tue Apr 22 13:09:42 2008 New Revision: 46947 URL: http://svn.opensuse.org/viewcvs/yast?rev=46947&view=rev Log: added fix for (bnc# 363254) - The boot partition is of type NFS. Bootloader cannot be installed. M bootloader/VERSION M bootloader/src/clients/bootloader_proposal.ycp * bnc# 363254 M bootloader/src/modules/Bootloader.ycp * bnc# 363254 M bootloader/src/routines/dialogs.ycp * bnc# 363254 M bootloader/src/generic/widget_funcs.ycp * problem with adding value via "Browsw..." button Modified: trunk/bootloader/VERSION trunk/bootloader/src/clients/bootloader_proposal.ycp trunk/bootloader/src/generic/widget_funcs.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/dialogs.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=46947&r1=46946&r2=46947&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Apr 22 13:09:42 2008 @@ -1 +1 @@ -2.16.12 +2.16.13 Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_proposal.ycp?rev=46947&r1=46946&r2=46947&view=diff ============================================================================== --- trunk/bootloader/src/clients/bootloader_proposal.ycp (original) +++ trunk/bootloader/src/clients/bootloader_proposal.ycp Tue Apr 22 13:09:42 2008 @@ -100,10 +100,14 @@ ret = $[ "raw_proposal" : Bootloader::Summary ()]; -//F#300779 - Install diskless client (NFS-root) -//kokso: bootloader will not be installed + //F#300779 - Install diskless client (NFS-root) + //kokso: bootloader will not be installed - 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") { @@ -115,7 +119,7 @@ } y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); -//F#300779 - end + //F#300779 - end if (Bootloader::getLoaderType () == "") { Modified: trunk/bootloader/src/generic/widget_funcs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/widget_funcs.ycp?rev=46947&r1=46946&r2=46947&view=diff ============================================================================== --- trunk/bootloader/src/generic/widget_funcs.ycp (original) +++ trunk/bootloader/src/generic/widget_funcs.ycp Tue Apr 22 13:09:42 2008 @@ -439,7 +439,15 @@ (string)UI::QueryWidget(`id(base_id), `Value), "*", _("Select a file name")); if (file_name != "" && file_name != nil) { - UI::ChangeWidget(`id(base_id), `Value, file_name); + +// ComboBox doesn't accept `Value, use `Items instead + // See bnc #380781 + if (UI::QueryWidget (`id (base_id), `WidgetClass) == "YComboBox") { + UI::ChangeWidget(`id(base_id), `Items, [file_name]); + } else { + UI::ChangeWidget(`id(base_id), `Value, file_name); + } + reason = "ValueChanged"; id = base_id; } Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloader.ycp?rev=46947&r1=46946&r2=46947&view=diff ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Tue Apr 22 13:09:42 2008 @@ -292,8 +292,11 @@ // F#300779 - Install diskless client (NFS-root) // kokso: additional warning that root partition is nfs type -> bootloader will not be installed - 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") { @@ -534,8 +537,11 @@ //F#300779 - Install diskless client (NFS-root) //kokso: bootloader will not be installed - 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") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); @@ -668,8 +674,11 @@ // F#300779 - Install diskless client (NFS-root) // kokso: bootloader will not be installed - 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") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); Modified: trunk/bootloader/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs.ycp?rev=46947&r1=46946&r2=46947&view=diff ============================================================================== --- trunk/bootloader/src/routines/dialogs.ycp (original) +++ trunk/bootloader/src/routines/dialogs.ycp Tue Apr 22 13:09:42 2008 @@ -91,8 +91,11 @@ //F#300779 - Install diskless client (NFS-root) //kokso: additional warning that root partition is nfs type -> bootloader will not be installed - 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())) { Popup::Message(_("The boot partition is of type NFS. Bootloader cannot be installed.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org