Mailinglist Archive: yast-commit (590 mails)

< Previous Next >
[yast-commit] r61607 - in /branches/SuSE-Code-11-SP1-Branch/reipl: VERSION package/yast2-reipl.changes src/Reipl.ycp src/reipl_bootloader_finish.ycp
  • From: jsrain@xxxxxxxxxxxxxxxx
  • Date: Thu, 08 Apr 2010 07:46:18 -0000
  • Message-id: <E1NzmRO-0001wc-FN@xxxxxxxxxxxxxxxx>
Author: jsrain
Date: Thu Apr 8 09:46:18 2010
New Revision: 61607

URL: http://svn.opensuse.org/viewcvs/yast?rev=61607&view=rev
Log:
fixed reboot after installation into LVM (bnc#592838)


Modified:
branches/SuSE-Code-11-SP1-Branch/reipl/VERSION
branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes
branches/SuSE-Code-11-SP1-Branch/reipl/src/Reipl.ycp
branches/SuSE-Code-11-SP1-Branch/reipl/src/reipl_bootloader_finish.ycp

Modified: branches/SuSE-Code-11-SP1-Branch/reipl/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl/VERSION?rev=61607&r1=61606&r2=61607&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/reipl/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/reipl/VERSION Thu Apr 8 09:46:18 2010
@@ -1 +1 @@
-2.17.4
+2.17.5

Modified: branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes?rev=61607&r1=61606&r2=61607&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes
(original)
+++ branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes Thu Apr
8 09:46:18 2010
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Apr 08 09:43:39 CEST 2009 - jsrain@xxxxxxx
+
+- fixed reboot after installation into LVM (bnc#592838)
+- 2.17.5
+
+-------------------------------------------------------------------
Mon Apr 20 12:01:39 CEST 2009 - jsrain@xxxxxxx

- fixed handling of more than 26 disks (bnc #492326)

Modified: branches/SuSE-Code-11-SP1-Branch/reipl/src/Reipl.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl/src/Reipl.ycp?rev=61607&r1=61606&r2=61607&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/reipl/src/Reipl.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/reipl/src/Reipl.ycp Thu Apr 8 09:46:18
2010
@@ -267,38 +267,40 @@

y2milestone ("FindBootPartition: found that the MBR uses dasd (%1)",
disk);

- // bash-3.1# readlink -m /sys/block/dasda/device
- // /sys/devices/css0/0.0.0006/0.0.4dcf
- command = "/usr/bin/readlink -n -m " + FindSysfsRoot () + "/block/" +
disk + "/device";
- y2milestone ("Executing %1", command);
- result = (map)SCR::Execute (.target.bash_output, command);
-
- if (result["exit"]:-1 != 0) {
- y2error ("FindBootPartition: Execute errors and returns %1",
result["exit"]:-1);
- y2error ("FindBootPartition: Execute stdout is \"%1\"",
result["stdout"]:"");
- y2error ("FindBootPartition: Execute stderr is \"%1\"",
result["stderr"]:"");
+ if (disk != nil) {
+ // bash-3.1# readlink -m /sys/block/dasda/device
+ // /sys/devices/css0/0.0.0006/0.0.4dcf
+ command = "/usr/bin/readlink -n -m " + FindSysfsRoot () + "/block/"
+ disk + "/device";
+ y2milestone ("Executing %1", command);
+ result = (map)SCR::Execute (.target.bash_output, command);

- fError = true;
- }
+ if (result["exit"]:-1 != 0) {
+ y2error ("FindBootPartition: Execute errors and returns %1",
result["exit"]:-1);
+ y2error ("FindBootPartition: Execute stdout is \"%1\"",
result["stdout"]:"");
+ y2error ("FindBootPartition: Execute stderr is \"%1\"",
result["stderr"]:"");

- y2milestone ("FindBootPartition: result = %1", result);
+ fError = true;
+ }

- list<string> readlinkParts = nil;
+ y2milestone ("FindBootPartition: result = %1", result);

- readlinkParts = splitstring (result["stdout"]:"", "/");
+ list<string> readlinkParts = nil;

- y2milestone ("FindBootPartition: readlinkParts = %1", readlinkParts);
+ readlinkParts = splitstring (result["stdout"]:"", "/");

- if (size (readlinkParts) < 1) {
- y2error ("FindBootPartition: readlinkParts size is unexpected %1",
readlinkParts);
+ y2milestone ("FindBootPartition: readlinkParts = %1",
readlinkParts);

- fError = true;
- }
+ if (size (readlinkParts) < 1) {
+ y2error ("FindBootPartition: readlinkParts size is unexpected
%1", readlinkParts);

- string ccwDevice = readlinkParts[size (readlinkParts) - 1]:"";
+ fError = true;
+ }
+
+ string ccwDevice = readlinkParts[size (readlinkParts) - 1]:"";

- if (!fError) {
- uParts = [ "ccw", ccwDevice];
+ if (!fError) {
+ uParts = [ "ccw", ccwDevice];
+ }
}

} else if (substring (fullDisk, 0, 2) == "sd") {
@@ -322,45 +324,47 @@
disk = split[0]:"" + split[1]:"";
}

- y2milestone ("FindBootPartition: found that the MBR uses SCSI (%1)",
disk);
-
- string deviceDirectory = FindSysfsRoot () + "/block/" + disk +
"/device/";
-
- // bash-3.1# cat /sys/block/sda/device/hba_id
- // 0.0.1734
- string hbaId = (string)SCR::Read (.target.string, deviceDirectory +
"hba_id");
-
- // bash-3.1# cat /sys/block/sda/device/wwpn
- // 0x500507630300c562
- string wwpn = (string)SCR::Read (.target.string, deviceDirectory +
"wwpn");
+ if (disk != nil) {
+ y2milestone ("FindBootPartition: found that the MBR uses SCSI
(%1)", disk);

- // bash-3.1# cat /sys/block/sda/device/fcp_lun
- // 0x401040eb00000000
- string fcpLun = (string)SCR::Read (.target.string, deviceDirectory +
"fcp_lun");
+ string deviceDirectory = FindSysfsRoot () + "/block/" + disk +
"/device/";

- y2milestone ("FindBootPartition: hbaId = %1", hbaId);
- y2milestone ("FindBootPartition: wwpn = %1", wwpn);
- y2milestone ("FindBootPartition: fcpLun = %1", fcpLun);
-
- hbaId = deletechars (hbaId, "\n\r");
- wwpn = deletechars (wwpn, "\n\r");
- fcpLun = deletechars (fcpLun, "\n\r");
-
- if (hbaId == nil || size (hbaId) == 0) {
- y2error ("FindBootPartition: hbaId is empty!");
- fError = true;
- }
- if (wwpn == nil || size (wwpn) == 0) {
- y2error ("FindBootPartition: wwpn is empty!");
- fError = true;
- }
- if (fcpLun == nil || size (fcpLun) == 0) {
- y2error ("FindBootPartition: fcpLun is empty!");
- fError = true;
- }
+ // bash-3.1# cat /sys/block/sda/device/hba_id
+ // 0.0.1734
+ string hbaId = (string)SCR::Read (.target.string, deviceDirectory +
"hba_id");
+
+ // bash-3.1# cat /sys/block/sda/device/wwpn
+ // 0x500507630300c562
+ string wwpn = (string)SCR::Read (.target.string, deviceDirectory +
"wwpn");
+
+ // bash-3.1# cat /sys/block/sda/device/fcp_lun
+ // 0x401040eb00000000
+ string fcpLun = (string)SCR::Read (.target.string, deviceDirectory
+ "fcp_lun");
+
+ y2milestone ("FindBootPartition: hbaId = %1", hbaId);
+ y2milestone ("FindBootPartition: wwpn = %1", wwpn);
+ y2milestone ("FindBootPartition: fcpLun = %1", fcpLun);
+
+ hbaId = deletechars (hbaId, "\n\r");
+ wwpn = deletechars (wwpn, "\n\r");
+ fcpLun = deletechars (fcpLun, "\n\r");
+
+ if (hbaId == nil || size (hbaId) == 0) {
+ y2error ("FindBootPartition: hbaId is empty!");
+ fError = true;
+ }
+ if (wwpn == nil || size (wwpn) == 0) {
+ y2error ("FindBootPartition: wwpn is empty!");
+ fError = true;
+ }
+ if (fcpLun == nil || size (fcpLun) == 0) {
+ y2error ("FindBootPartition: fcpLun is empty!");
+ fError = true;
+ }

- if (!fError) {
- uParts = [ "zfcp", hbaId, wwpn, fcpLun ];
+ if (!fError) {
+ uParts = [ "zfcp", hbaId, wwpn, fcpLun ];
+ }
}

} else {
@@ -434,7 +438,8 @@
y2milestone ("ModifyReiplWithBootPartition: modified fcp map");
}
else {
- y2error ("ModifyReiplWithBootPartition: Should not be here,
configuration unmodified!");
+ y2error ("ModifyReiplWithBootPartition: Unknown disk type!");
+ configuration["method"] = "unknown_disk_type";
}

return configuration;
@@ -528,7 +533,7 @@
global boolean WriteState (map <string, any> configuration) {
boolean rc = true;

- if (configuration["method"]:nil != nil) {
+ if (configuration["method"]:nil != nil &&
configuration["method"]:"unknown_disk_type" != "unknown_disk_type") {
y2milestone ("Reipl::WriteState: writing out method %1",
configuration["method"]:"");

SCR::Write (.target.string, reipl_directory + "/reipl_type",
(string)configuration["method"]:nil);

Modified: branches/SuSE-Code-11-SP1-Branch/reipl/src/reipl_bootloader_finish.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/reipl/src/reipl_bootloader_finish.ycp?rev=61607&r1=61606&r2=61607&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/reipl/src/reipl_bootloader_finish.ycp
(original)
+++ branches/SuSE-Code-11-SP1-Branch/reipl/src/reipl_bootloader_finish.ycp Thu
Apr 8 09:46:18 2010
@@ -88,7 +88,11 @@
and LUN '%3'.
"), dev, wwpn, lun);
} else {
- y2warning("cannot make ipl text for unknown method");
+ y2warning("making generic ipl text for unknown method");
+ ipl_msg = sformat (_("
+After shutdown, reload the system
+with an IPL from the device
+that contains /boot"));
}
}
}

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages