Author: juhliarik Date: Mon Jan 21 17:01:04 2008 New Revision: 43797 URL: http://svn.opensuse.org/viewcvs/yast?rev=43797&view=rev Log: - added support for feature FATE#300779 Install diskless client (NFS-root) - added proofread text 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=43797&r1=43796&r2=43797&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 Mon Jan 21 17:01:04 2008 @@ -97,6 +97,15 @@ ret = $[ "raw_proposal" : Bootloader::Summary ()]; +//FIXME kokso: added check for root device if root device == NFS -> stop installing bootloader + if (BootCommon::BootPartitionDevice == "/dev/nfs") + { + + y2milestone("bootlader_proposal - MakeProposal: Boot partition is nfs type, bootloader will not be installed."); + return ret; + + } + 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=43797&r1=43796&r2=43797&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 Mon Jan 21 17:01:04 2008 @@ -277,7 +277,18 @@ * @return a list of summary lines */ global define list<string> Summary () { - list<string> ret = blSummary (); + list<string> ret =[]; +//FIXME kokso: added check for root device if root device == NFS -> stop installing bootloader + if (BootCommon::BootPartitionDevice == "/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."); + return ret; + + } + + ret = blSummary (); // check if default section was changed or not string main_section = getProposedDefaultSection (); if (main_section == nil) @@ -504,9 +515,9 @@ } //FIXME kokso: added check for root device if root device == NFS -> stop installing bootloader - if (BootCommon::RootPartitionDevice == "/dev/nfs") + if (BootCommon::BootPartitionDevice == "/dev/nfs") { - y2milestone("Root partition is nfs type, bootloader will not be installed."); + y2milestone("Boot partition is nfs type, bootloader will not be installed."); return ret; } 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=43797&r1=43796&r2=43797&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 Mon Jan 21 17:01:04 2008 @@ -86,9 +86,9 @@ `Right ("adv_button") ); //FIXME kokso: additional warning that root partition is nfs type -> bootloader will not be installed - if ((BootCommon::RootPartitionDevice == "/dev/nfs") && (Mode::installation())) + if ((BootCommon::BootPartitionDevice == "/dev/nfs") && (Mode::installation())) { - Popup::Message(_("The root partition is of type NFS. Bootloader cannot be installed.")); + Popup::Message(_("The boot partition is of type NFS. Bootloader cannot be installed.")); return `next; } list<string> widget_names = ["tab", "adv_button"]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org