[yast-commit] r57827 - in /branches/SuSE-SLE-10-SP2-Branch/bootloader: ./ package/ src/clients/ src/modules/ src/routines/
Author: juhliarik
Date: Wed Jul 1 16:41:08 2009
New Revision: 57827
URL: http://svn.opensuse.org/viewcvs/yast?rev=57827&view=rev
Log:
added fix for "/" on nfs
Modified:
branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION
branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes
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
branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/misc.ycp
Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION?rev=57827&r1=57826&r2=57827&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION (original)
+++ branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION Wed Jul 1 16:41:08 2009
@@ -1 +1 @@
-2.13.155.1
+2.13.155.2
Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes?rev=57827&r1=57826&r2=57827&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes Wed Jul 1 16:41:08 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jul 1 16:29:13 CEST 2009 - juhliarik@suse.cz
+
+- added fix for problem with "/" on NFS (bnc#448950)
+- 2.13.155.2
+
+-------------------------------------------------------------------
Wed Jun 11 16:23:19 CEST 2008 - juhliarik@suse.cz
- added fix for activating partition for XEN (bnc #380982)
- 2.13.155.1
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=57827&r1=57826&r2=57827&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 Wed Jul 1 16:41:08 2009
@@ -97,24 +97,21 @@
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
-
-//B#355332 - Bootloader doesn't work if root partitions is like nfs
-
- map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
-
- if (dev["disk"]:"" == "/dev/nfs")
+ // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed
+ // F#300779 - Install diskless client (NFS-root)
+ // kokso: bootloader will not be installed
+ string device = BootCommon::getBootDisk();
+ if (device == "/dev/nfs")
{
-
+
y2milestone("bootlader_proposal::MakeProposal -> Boot partition is nfs type, bootloader will not be installed.");
- y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
+ y2milestone("Type of BootPartitionDevice: %1", device);
return ret;
}
- y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
+ y2milestone("Type of BootPartitionDevice: %1", device);
+ // F#300779 - end
-//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=57827&r1=57826&r2=57827&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 Wed Jul 1 16:41:08 2009
@@ -278,22 +278,18 @@
*/
global define list<string> Summary () {
list<string> ret =[];
+ // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed
+ // F#300779 - Install diskless client (NFS-root)
+ // kokso: bootloader will not be installed
+ string device = BootCommon::getBootDisk();
-//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")
+ if (device == "/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;
-
+ y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed.");
+ return ret;
}
-//F#300779 - end
+ // F#300779 -end
+
ret = blSummary ();
// check if default section was changed or not
string main_section = getProposedDefaultSection ();
@@ -584,22 +580,19 @@
return ret;
}
+ // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed
+ // F#300779 - Install diskless client (NFS-root)
+ // kokso: bootloader will not be installed
+ string device = BootCommon::getBootDisk();
- // 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")
+ if (device == "/dev/nfs")
{
y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed.");
return ret;
}
+ // F#300779 -end
- // 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=57827&r1=57826&r2=57827&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 Wed Jul 1 16:41:08 2009
@@ -86,21 +86,18 @@
"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
+ // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed
+ // F#300779 - Install diskless client (NFS-root)
+ // kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+ string device = BootCommon::getBootDisk();
-//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()))
+ if ((device == "/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
+ // F#300779: end
list<string> widget_names = ["tab", "adv_button"];
map
participants (1)
-
juhliarik@svn.opensuse.org