[yast-commit] r58126 - in /trunk/bootloader: ./ package/ src/clients/ src/grub/ src/modules/ src/routines/

22 Jul 2009

Author: juhliarik
Date: Wed Jul 22 13:39:44 2009
New Revision: 58126

URL: http://svn.opensuse.org/viewcvs/yast?rev=58126&view=rev
Log:
added several fixes

Added:
    trunk/bootloader/src/clients/bootloader_preupdate.ycp
    trunk/bootloader/src/clients/inst_lilo_convert.ycp
Modified:
    trunk/bootloader/VERSION
    trunk/bootloader/package/yast2-bootloader.changes
    trunk/bootloader/src/clients/Makefile.am
    trunk/bootloader/src/clients/bootloader_proposal.ycp
    trunk/bootloader/src/grub/misc.ycp
    trunk/bootloader/src/grub/options.ycp
    trunk/bootloader/src/modules/BootGRUB.ycp
    trunk/bootloader/src/modules/BootSupportCheck.ycp
    trunk/bootloader/src/routines/helps.ycp
    trunk/bootloader/yast2-bootloader.spec.in

Modified: trunk/bootloader/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================

--- trunk/bootloader/VERSION (original)
+++ trunk/bootloader/VERSION Wed Jul 22 13:39:44 2009
@@ -1 +1 @@
-2.18.8
+2.18.9

Modified: trunk/bootloader/package/yast2-bootloader.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/package/yast2-bootloader.changes (original)
+++ trunk/bootloader/package/yast2-bootloader.changes Wed Jul 22 13:39:44 2009
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Mon Jul 20 16:51:05 CEST 2009 - juhliarik@suse.cz
+
+- added client bootloader_preupdate it takes care about calling 
+  Storage::Update() (bnc#414490)
+- added fix for using iscsi disk (bnc#393928)
+- updated help text (bnc#511007)
+- enabled change bootloader settings via one-click in installation
+  summary (fate#303643)
+- deleted warning message about using ext4
+- updated proposal and using checkboxes Boot from Boot Partition
+  and Boot from Extended Partition
+- 2.18.9
+
+-------------------------------------------------------------------
 Mon Jun  8 10:37:27 CEST 2009 - jsrain@suse.cz
 
 - do not add 'ide=nodma' to failsafe kernel parameter (bnc#510784)

Modified: trunk/bootloader/src/clients/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/Makefile.am?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/src/clients/Makefile.am (original)
+++ trunk/bootloader/src/clients/Makefile.am Wed Jul 22 13:39:44 2009
@@ -9,7 +9,8 @@
 	bootloader_finish.ycp	\
 	print-product.ycp	\
 	inst_bootloader.ycp	\
-	inst_lilo_convert.ycp
+	inst_lilo_convert.ycp	\
+	bootloader_preupdate.ycp
 
 EXTRA_DIST = 			\
 	$(client_DATA)

Added: trunk/bootloader/src/clients/bootloader_preupdate.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_preupdate.ycp?rev=58126&view=auto
==============================================================================
--- trunk/bootloader/src/clients/bootloader_preupdate.ycp (added)
+++ trunk/bootloader/src/clients/bootloader_preupdate.ycp Wed Jul 22 13:39:44 2009
@@ -0,0 +1,132 @@
+/**
+ * File:
+ *      bootloader/routines/bootloader_preupdate.ycp
+ *
+ * Module:
+ *      Bootloader installation and configuration
+ *
+ * Summary:
+ *      Client for handling pre-update bootloader configuration
+ *
+ * Authors:
+ *      Jozef Uhliarik 
+ *
+ *
+ */
+
+{
+
+textdomain "bootloader";
+
+
+import "BootCommon";
+import "BootStorage";
+import "Installation";
+import "GetInstArgs";
+import "Mode";
+import "Arch";
+import "BootGRUB";
+import "Storage";
+
+y2milestone ("starting bootloader_preupdate");
+
+boolean preUpdateDeviceMap()
+{
+    boolean ret = false;
+    string device_map = (string) WFM::Read(.local.string, Installation::destdir +"/boot/grub/device.map");
+    if (device_map == nil)
+    {
+	y2error("Reading device map failed.");
+	return false;
+    }
+    y2milestone("Device map: %1", device_map);
+
+    BootCommon::InitializeLibrary(true, "grub");
+    BootCommon::setLoaderType("grub");
+    map new_files = $[]; 
+    new_files["/boot/grub/device.map"] = device_map;
+    ret = BootCommon::SetFilesContents (new_files);
+    if (!ret)
+    {
+	y2error("SetFilesContents failed.");
+	return false;
+    }
+    BootStorage::device_mapping = BootCommon::GetDeviceMap ();
+
+    if ((BootStorage::device_mapping == nil) || (size(BootStorage::device_mapping) == 0))
+    {
+	y2error("Parsing device map failed or it is empty.");
+	return false;
+    }
+    BootCommon::UpdateDeviceMap();
+
+    ret = BootCommon::SetDeviceMap(BootStorage::device_mapping);
+    if (!ret)
+    {
+	y2error("Set device map failed.");
+	return false;
+    }
+ 
+    new_files = BootCommon::GetFilesContents();
+    y2milestone("new content file: %1", new_files);
+
+    string content_dev_map = new_files["/boot/grub/device.map"]:nil;
+
+    if ((content_dev_map != nil ) && (content_dev_map != ""))
+    {
+	y2milestone("writing device map: %1", content_dev_map); 
+	WFM::Write(.local.string, Installation::destdir +"/boot/grub/device.map",
+ 		   content_dev_map);
+    }
+
+    return ret;
+}
+
+
+if ( GetInstArgs::going_back())     // going backwards?
+{
+    return `auto;                   // don't execute this once more
+}
+
+if (Mode::update() && (Arch::x86_64() || Arch::i386()))
+{
+ 
+    // save some sysconfig variables
+    // register new agent pointing into the mounted filesystem
+    path sys_agent = .target.sysconfig.bootloader;
+
+    string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader";
+    SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini(`SysConfigFile(target_sysconfig_path)));
+
+    string bl = (string) SCR::Read(add(sys_agent,.LOADER_TYPE));
+
+    any ret = nil;
+    if (bl == "grub") {
+
+	y2milestone("updating device map...");
+	if (preUpdateDeviceMap())
+	{
+	    y2milestone("Update device map is done successful");
+	    BootGRUB::update_device_map_done = true;
+	} else {
+	    y2error("Update device map failed");
+	    BootGRUB::update_device_map_done = false;
+	}
+
+	y2milestone("Calling storage update");
+	Storage::Update (Installation::installedVersion, Installation::updateVersion);
+    }
+
+    if (ret == `back)
+	return `back;
+
+    if (ret == `next)
+	return `next;
+
+}
+
+y2milestone ("finish bootloader_preupdate");
+
+return `auto;
+
+}

Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_proposal.ycp?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/src/clients/bootloader_proposal.ycp (original)
+++ trunk/bootloader/src/clients/bootloader_proposal.ycp Wed Jul 22 13:39:44 2009
@@ -93,6 +93,12 @@
 
 	    
 	    BootGRUB::merge_level = `none;
+
+	    ret["links"] = [
+		"enable_boot_mbr", "disable_boot_mbr",
+		"enable_boot_root", "disable_boot_root",
+		"enable_boot_boot", "disable_boot_boot",
+	    ];
 	}
 	else
 	{
@@ -101,7 +107,7 @@
 	// to make sure packages will get installed
 	BootCommon::setLoaderType (BootCommon::getLoaderType (false));
 
-	ret = $[ "raw_proposal" : Bootloader::Summary ()];
+	ret["raw_proposal"] = Bootloader::Summary ();
 
 
 	if (Bootloader::getLoaderType () == "grub")
@@ -238,21 +244,74 @@
     // up the Bootloader.
     else if ( func == "AskUser" )
     {
-	boolean has_next = param["has_next"]:false;
 
-	map settings = Bootloader::Export ();
-	// don't ask for abort confirm if nothing was changed (#29496)
-	BootCommon::changed = false;
-	symbol result = BootloaderAutoSequence ();
-	// set to true, simply because must be saved during installation
-	BootCommon::changed = true;
-	if (result != `next)
-	    Bootloader::Import ((map)settings);
-	else
+	any chosen_id = param["chosen_id"]:nil;
+	symbol result = `next;
+	y2milestone("Bootloader wanted to change with id %1", chosen_id);
+
+	// enable boot from MBR
+	if (chosen_id == "enable_boot_mbr") 
+	{
+	    y2milestone("Boot from MBR enabled by a single-click");
+	    BootCommon::globals["boot_mbr"] = "true";
+	    Bootloader::proposed_cfg_changed = true;
+	}
+
+	// disable boot from MBR
+	else if (chosen_id == "disable_boot_mbr") 
+	{
+	    y2milestone("Boot from MBR disabled by a single-click");
+	    BootCommon::globals["boot_mbr"] = "false";
 	    Bootloader::proposed_cfg_changed = true;
+	}
+	// enable boot from /boot
+	else if (chosen_id == "enable_boot_boot") 
+	{
+	    y2milestone("Boot from /boot enabled by a single-click");
+	    BootCommon::globals["boot_boot"] = "true";
+	    Bootloader::proposed_cfg_changed = true;
+	}
 
+	// disable boot from /boot
+	else if (chosen_id == "disable_boot_boot") 
+	{
+	    y2milestone("Boot from /boot disabled by a single-click");
+	    BootCommon::globals["boot_boot"] = "false";
+	    Bootloader::proposed_cfg_changed = true;
+	}
+
+	// enable boot from /
+	else if (chosen_id == "enable_boot_root") 
+	{
+	    y2milestone("Boot from / enabled by a single-click");
+	    BootCommon::globals["boot_root"] = "true";
+	    Bootloader::proposed_cfg_changed = true;
+	}
+
+	// disable boot from /
+	else if (chosen_id == "disable_boot_root") 
+	{
+	    y2milestone("Boot from / disabled by a single-click");
+	    BootCommon::globals["boot_root"] = "false";
+	    Bootloader::proposed_cfg_changed = true;
+	}	
+	else
+	{
+	    boolean has_next = param["has_next"]:false;
+
+	    map settings = Bootloader::Export ();
+	    // don't ask for abort confirm if nothing was changed (#29496)
+	    BootCommon::changed = false;
+	    result = BootloaderAutoSequence ();
+	    // set to true, simply because must be saved during installation
+	    BootCommon::changed = true;
+	    if (result != `next)
+		Bootloader::Import ((map)settings);
+	    else
+		Bootloader::proposed_cfg_changed = true;
+	}
 	// Fill return map
-	ret = $[ "workflow_sequence" : result ];
+	ret["workflow_sequence"] = result;
     }
     // This describes the "active" parts of the Bootloader proposal section.
     else if ( func == "Description" )

Added: trunk/bootloader/src/clients/inst_lilo_convert.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/inst_lilo_convert.ycp?rev=58126&view=auto
==============================================================================
--- trunk/bootloader/src/clients/inst_lilo_convert.ycp (added)
+++ trunk/bootloader/src/clients/inst_lilo_convert.ycp Wed Jul 22 13:39:44 2009
@@ -0,0 +1,179 @@
+/**
+ * File:
+ *      bootloader/routines/inst_bootloader.ycp
+ *
+ * Module:
+ *      Bootloader installation and configuration
+ *
+ * Summary:
+ *      Functions to write "dummy" config files for kernel
+ *
+ * Authors:
+ *      Jozef Uhliarik 
+ *
+ *
+ */
+
+{
+
+textdomain "bootloader";
+
+
+import "BootCommon";
+import "BootStorage";
+import "Installation";
+import "GetInstArgs";
+import "Mode";
+import "Label";
+import "Wizard";
+import "Popup";
+import "Pkg";
+import "Arch";
+import "BootGRUB";
+import "PackagesProposal";
+
+y2milestone ("starting inst_lilo_convert");
+
+
+
+
+
+void selectPackage()
+{
+   PackagesProposal::AddResolvables ("yast2-bootloader", `package, ["grub"]);
+}
+
+void convertSettings()
+{
+
+    string lilo_conf = (string) WFM::Read(.local.string, Installation::destdir + "/etc/lilo.conf");
+    BootCommon::InitializeLibrary(true, "lilo");
+    BootCommon::setLoaderType("lilo");
+    map new_files = $[]; 
+    new_files["/etc/lilo.conf"] = lilo_conf;
+    y2milestone("/etc/lilo.conf : %1", new_files);
+    BootCommon::SetFilesContents (new_files);
+
+    list > sec = BootCommon::GetSections();
+
+    BootCommon::sections = sec;
+    BootCommon::globals = BootCommon::GetGlobal ();
+    
+    BootCommon::InitializeLibrary(true, "grub");
+    BootCommon::setLoaderType("grub");
+
+    BootStorage::ProposeDeviceMap ();
+    BootGRUB::Propose();
+
+
+    BootCommon::SetDeviceMap(BootStorage::device_mapping);
+    BootCommon::SetSections(sec);
+    BootCommon::SetGlobal(BootCommon::globals);
+
+
+
+    map tmp_files = BootCommon::GetFilesContents ();
+
+    y2milestone("new content file: %1", tmp_files);
+    foreach (string file, string content, tmp_files,
+    {
+	integer last=findlastof(file,"/");
+	string path_file = substring (file, 0, last);
+	WFM::Execute(.local.mkdir, Installation::destdir + path_file);
+	y2milestone ("writing file: %1", file); 
+	WFM::Write(.local.string, Installation::destdir + file, content);
+    });
+}
+
+
+
+
+if ( GetInstArgs::going_back())     // going backwards?
+{
+    return `auto;                   // don't execute this once more
+}
+
+
+boolean checkArch()
+{
+   boolean ret = false;
+   if (Arch::x86_64() || Arch::i386())
+      ret = true;
+
+   if (ret)
+      y2milestone("inst_lilo_convert - supported architecture for converting LILO -> GRUB");
+   else
+      y2milestone("inst_lilo_convert - UNsupported architecture for converting LILO -> GRUB");
+   return ret;
+
+}
+
+if (Mode::update() && checkArch())
+{
+ 
+    // save some sysconfig variables
+    // register new agent pointing into the mounted filesystem
+    path sys_agent = .target.sysconfig.bootloader;
+
+    string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader";
+    SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini(`SysConfigFile(target_sysconfig_path)));
+
+    string bl = (string) SCR::Read(add(sys_agent,.LOADER_TYPE));
+
+    term convert_question = `VBox(
+	`HBox (
+	`HStretch(),
+	`RadioButtonGroup(`id(`convert),
+	     `HSquash (
+	     `VBox(`Left(`Label("LILO is not supported. The recommended option is select convert LILO to GRUB")),
+		   `Left(`Label("Do you want convert settings and install GRUB?")),
+		   `Left(`RadioButton(`id("lilo"), _("Stay &LILO"))),
+		   `Left(`RadioButton(`id("grub"), _("Convert Settings and Install &GRUB"), true ))
+	     )
+	     )
+	),
+	`HStretch()
+	)
+    );
+    any ret = nil;
+    if (bl == "lilo")
+    {
+    	Wizard::CreateDialog();
+	Wizard::SetDesktopIcon("bootloader");
+	Wizard::SetContentsButtons("Converting LILO to GRUB", convert_question, 
+	    _("LILO is not supported. The recommended option is select convert LILO to GRUB"),
+	    Label::BackButton(), Label::NextButton());
+	UI::ChangeWidget(`id(`abort),`Label, Label::CancelButton());
+	UI::ChangeWidget(`id(`abort), `Enabled, false);
+	
+	while (true) 
+	{
+	   ret = UI::UserInput();
+	   string current = (string) UI::QueryWidget(`id(`convert), `CurrentButton);
+	   // One of those dialog buttons have been pressed
+	   if (ret == `next)
+	   {
+		selectPackage();
+		convertSettings();
+		SCR::Write (add(sys_agent,.LOADER_TYPE), "grub");
+		SCR::Write (sys_agent, nil);
+	   }
+	   break;
+
+        }
+	UI::CloseDialog();
+    }
+
+    if (ret == `back)
+	return `back;
+
+    if (ret == `next)
+	return `next;
+
+}
+
+y2milestone ("finish inst_lilo_convert");
+
+return `auto;
+
+}

Modified: trunk/bootloader/src/grub/misc.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/src/grub/misc.ycp (original)
+++ trunk/bootloader/src/grub/misc.ycp Wed Jul 22 13:39:44 2009
@@ -604,7 +604,7 @@
     // see bug #279837 comment #53
     if (boot_partition_is_on_mbr_disk)
     {
-	selected_location = `boot;
+	selected_location = (BootStorage::BootPartitionDevice != BootStorage::RootPartitionDevice) ? `boot : `root;
 	BootCommon::globals["activate"] = "true";
 	BootCommon::activate_changed = true;
 
@@ -648,7 +648,7 @@
 	if (is_logical && extended != nil)
 	    selected_location = `extended;
 	else
-	    selected_location = `boot;
+	    selected_location = (BootStorage::BootPartitionDevice != BootStorage::RootPartitionDevice) ? `boot : `root;
     }
 
     SetBootloaderDevice(selected_location);
@@ -935,6 +935,7 @@
 	|| (BootCommon::cached_settings_base_data_change_time != Storage::GetTargetChangeTime()))
     {
 	BootStorage::ProposeDeviceMap();
+	BootCommon::InitializeLibrary (true, "grub");
     }
 
     if ( ! Mode::autoinst () ) {

Modified: trunk/bootloader/src/grub/options.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/options.ycp?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/src/grub/options.ycp (original)
+++ trunk/bootloader/src/grub/options.ycp Wed Jul 22 13:39:44 2009
@@ -463,6 +463,17 @@
 	UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, true);
 	UI::ChangeWidget (`id ("boot_custom_list"),`Value, BootCommon::globals["boot_custom"]:"");
     }
+
+    if (BootStorage::BootPartitionDevice == BootStorage::RootPartitionDevice)
+	UI::ChangeWidget (`id ("boot_boot"), `Enabled, false);
+    else
+	UI::ChangeWidget (`id ("boot_boot"), `Enabled, true);
+
+    if (BootStorage::ExtendedPartitionDevice != nil)
+	UI::ChangeWidget (`id ("boot_extended"), `Enabled, true);
+    else
+	UI::ChangeWidget (`id ("boot_extended"), `Enabled, false);
+
 }
 /**
  * handle function of a widget
@@ -520,6 +531,12 @@
     return ret;
 }
 
+/**
+ * Create Frame "Boot Loader Location"
+ *
+ * @return term with widgets
+ */
+
 map grubBootLoaderLocationWidget ()
 {
     term contents = `VBox (

Modified: trunk/bootloader/src/modules/BootGRUB.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootGRUB.ycp (original)
+++ trunk/bootloader/src/modules/BootGRUB.ycp Wed Jul 22 13:39:44 2009
@@ -42,6 +42,14 @@
   */
 global symbol merge_level = `main;
 
+/**
+ * The variable indicate if client bootloader_preupdate
+ * successful update device map
+ * If success true else false 
+ */
+
+global boolean update_device_map_done = false;
+
 // variables for temporary data
 
 /**
@@ -627,6 +635,62 @@
     return ret;
 }
 
+/** FATE#303643 Enable one-click changes in bootloader proposal
+ *
+ *
+ */
+string urlLocationSummary()
+{
+    y2milestone("Prepare url summary for GRUB");
+    string ret = "";
+    string line = "";
+    list<string> locations = [];
+    line = "<ul>\n<li>";
+    if (BootCommon::globals["boot_mbr"]:"" == "true")
+	line = line +
+	    _("Boot from MBR is enabled (disable</a>") + ")</li>\n";
+    else
+	line = line +
+	    _("Boot from MBR is disabled (enable</a>") + ")</li>\n";
+    locations = add(locations, line);
+    line ="<li>";
+
+    boolean set_boot_boot = false;
+    if ((BootCommon::globals["boot_boot"]:"" == "true") && 
+	(BootStorage::BootPartitionDevice != BootStorage::RootPartitionDevice))
+    {
+	set_boot_boot = true;
+	line = line +
+	    _("Boot from /boot partition is enabled (disable</a>") + ")</li></ul>";
+    }
+    else if ((BootCommon::globals["boot_boot"]:"" == "false") && 
+	(BootStorage::BootPartitionDevice != BootStorage::RootPartitionDevice))
+    {
+	set_boot_boot = true;
+	line = line +
+	    _("Boot from /boot partition is disabled (enable</a>") + ")</li></ul>";
+    }
+    if (line != "<li>")
+    {	
+	locations = add(locations, line);
+	line ="<li>";
+    }
+    if ((BootCommon::globals["boot_root"]:"" == "true") && (!set_boot_boot))
+	line = line +
+	    _("Boot from \"/\" partition is enabled (disable</a>") + ")</li></ul>";
+    else if ((BootCommon::globals["boot_root"]:"" == "false") && (!set_boot_boot))
+	line = line +
+	    _("Boot from \"/\" partition is disabled (enable</a>") + ")</li></ul>";
+    if (!set_boot_boot)
+	locations = add(locations, line);
+
+    if (size(locations) > 0) {
+           // FIXME: should we translate all devices to names and add MBR suffixes?
+           ret = sformat (_("Change Location: %1"), mergestring (locations, " "));
+    }
+
+    return ret;
+}
 
 /**
  * Display bootloader summary
@@ -646,23 +710,29 @@
 
     // summary text, location is location description (eg. /dev/hda)
     list<string> locations = [];
+    string line = "";
+    
 
-    if (BootCommon::globals["boot_boot"]:"" == "true")
-        locations = add(locations, BootStorage::BootPartitionDevice + " (\"/boot\")");
-    if (BootCommon::globals["boot_extended"]:"" == "true")
-        locations = add(locations, BootStorage::ExtendedPartitionDevice + " (extended)");
-    if (BootCommon::globals["boot_root"]:"" == "true")
-        locations = add(locations, BootStorage::RootPartitionDevice + " (\"/\")");
-    if (BootCommon::globals["boot_mbr"]:"" == "true")
-        locations = add(locations, BootCommon::mbrDisk + " (MBR)");
-    if (haskey (BootCommon::globals, "boot_custom"))
-        locations = add(locations, BootCommon::globals["boot_custom"]:"");
-
-    if (size(locations) > 0) {
-        // FIXME: should we translate all devices to names and add MBR suffixes?
-        ret = add (ret, sformat (_("Location: %1"),
-				 mergestring (locations, ", "))
-		   );
+	if (BootCommon::globals["boot_boot"]:"" == "true")
+            locations = add(locations, BootStorage::BootPartitionDevice + _(" (\"/boot\")"));
+	if (BootCommon::globals["boot_extended"]:"" == "true")
+            locations = add(locations, BootStorage::ExtendedPartitionDevice + _(" (extended)"));
+    	if (BootCommon::globals["boot_root"]:"" == "true")
+            locations = add(locations, BootStorage::RootPartitionDevice + _(" (\"/\")"));
+    	if (BootCommon::globals["boot_mbr"]:"" == "true")
+            locations = add(locations, BootCommon::mbrDisk + _(" (MBR)"));
+    	if (haskey (BootCommon::globals, "boot_custom"))
+            locations = add(locations, BootCommon::globals["boot_custom"]:"");
+	if (size(locations) > 0) {
+           // FIXME: should we translate all devices to names and add MBR suffixes?
+           ret = add (ret, sformat (_("Status Location: %1"), mergestring (locations, ", ")));
+        }
+    // it is necessary different summary for autoyast and installation
+    // other mode than autoyast on running system
+    if (!Mode::config())
+    {
+	//ret = add(ret, _("Change Location:"));
+	ret = add(ret, urlLocationSummary());
     }
 
     // summary text. %1 is list of bootloader sections
@@ -693,7 +763,11 @@
   * Update read settings to new version of configuration files
   */
 global define void Update () {
-    BootCommon::UpdateDeviceMap ();
+    // update device map would be done in bootloader_preupdate
+    // run update device only if it was not called or if update device
+    // failed in bootloader_preupdate
+    if (!update_device_map_done)
+        BootCommon::UpdateDeviceMap ();
 
     // During update, for libata device name migration ("/dev/hda1" ->
     // "/dev/sda1") and somesuch, we need to re-read and parse the rest of the

Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSupportCheck.ycp?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootSupportCheck.ycp (original)
+++ trunk/bootloader/src/modules/BootSupportCheck.ycp Wed Jul 22 13:39:44 2009
@@ -178,6 +178,7 @@
 
     boot_device = BootCommon::getBootPartition();
 
+    string boot_disk = BootCommon::getBootDisk();
     // if (BootStorage::BootPartitionDevice == BootStorage::RootPartitionDevice)
     // AddNewProblem (_("Doesn't exist separete /boot partition"));
 
@@ -187,6 +188,19 @@
     {
 	foreach (string k, map v, devices, 
 	{
+	    // check if boot disk is iscsi disk
+	    // bnc#393928: Installing root system on iscsi disk makes the system useless
+	    if (k == boot_disk)
+	    {
+		// if "iscsi" is true
+		if (v["iscsi"]:false)
+		{
+		    AddNewProblem (sformat(_("The boot device is on iSCSI disk: %1. System may not boot."),
+				 k));
+		    y2error("The boot partition: %1 is on iscsi disk: %2", boot_device,  k);
+		    result = false;
+		}
+	    }
 	    foreach (map p, (list<map>)(v["partitions"]:[]), 
 	    {
 		if (p["device"]:"" == boot_device)
@@ -220,16 +234,6 @@
 			    y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:"");
 			}
 		    }
-
-		    // check if /boot directory is on supported filesystem
-		    // FATE#305691 -> Support ext4 as installation option
-		    if (p["used_fs"]:nil == `ext4) 
-		    {
-			AddNewProblem (_("The /boot directory is on an ext4 filesystem. Create separate /boot partition with ext2 filesytem"));
-			y2error ("The /boot directory is on an ext4 filesystem");
-			result = false;
-			break;
-		    }
 		    if (p["used_fs"]:nil == `xfs) 
 		    {
 			AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot."));

Modified: trunk/bootloader/src/routines/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/helps.ycp?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/src/routines/helps.ycp (original)
+++ trunk/bootloader/src/routines/helps.ycp Wed Jul 22 13:39:44 2009
@@ -226,15 +226,21 @@
 section. Then modify the options that should differ from the
 selected section.</p>") +
     // help text 3/5
-    _("<p>Select <b>Kernel (Linux)</b> to add a new Linux kernel or other image
+    _("<p>Select <b>Image Section</b> to add a new Linux kernel or other image
 to load and start.</p>") +
     // help text 4/5
-    _("<p>Select <b>Kernel via XEN<b> to add a new Linux kernel or other image,
+    _("<p>Select <b>XEN Section</b> to add a new Linux kernel or other image,
 but to start it in a XEN environment.</p>") +
     // help text 5/5
     _("<p>Select <b>Other System (Chainloader)</b> to add a section that 
 loads and starts a boot sector of a partition of the disk. This is used for
+booting other operating systems.</p>") +
+
+    _("<p>Select <b>Menu Section</b> to add a section that 
+loads configuration file (the list of boot sections) from a partition of the disk. This is used for
 booting other operating systems.</p>");
+
+
 }
 
 } // EOF

Modified: trunk/bootloader/yast2-bootloader.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec.in?rev=58126&r1=58125&r2=58126&view=diff
==============================================================================
--- trunk/bootloader/yast2-bootloader.spec.in (original)
+++ trunk/bootloader/yast2-bootloader.spec.in Wed Jul 22 13:39:44 2009
@@ -67,8 +67,7 @@
 @moduledir@/*
 @clientdir@/bootloader*.ycp
 @clientdir@/print-product.ycp
-@clientdir@/inst_bootl*.ycp
-@clientdir@/inst_lilo_convert.ycp
+@clientdir@/inst_*.ycp
 @ybindir@/*
 @agentdir@/ag_*
 @scrconfdir@/*.scr

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r58126 - in /trunk/bootloader: ./ package/ src/clients/ src/grub/ src/modules/ src/routines/

juhliarik＠svn.opensuse.org