Author: juhliarik Date: Fri Feb 6 15:36:31 2009 New Revision: 55309 URL: http://svn.opensuse.org/viewcvs/yast?rev=55309&view=rev Log: - added pacth from IBM for s390 and reipl - updated function Dev2MountByDev() for increasing performance - new version 2.17.56 M bootloader/VERSION M bootloader/package/yast2-bootloader.changes * new version M bootloader/src/clients/bootloader_finish.ycp * patch from IBM M bootloader/src/routines/misc.ycp * updated function Dev2MountByDev() Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-Branch/bootloader/src/clients/bootloader_finish.ycp branches/SuSE-Code-11-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloader... ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-Branch/bootloader/VERSION Fri Feb 6 15:36:31 2009 @@ -1 +1 @@ -2.17.55 +2.17.56 Modified: branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloader... ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes Fri Feb 6 15:36:31 2009 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Feb 6 15:09:36 CET 2009 - juhliarik@suse.de + +- added pacth from IBM for s390 and reipl (bnc#471522) +- 2.17.56 + +------------------------------------------------------------------- +Fri Feb 6 10:56:43 CET 2009 - juhliarik@suse.de + +- updated function Dev2MountByDev() for increase performance + (bnc#468922) + +------------------------------------------------------------------- Thu Feb 5 15:28:09 CET 2009 - juhliarik@suse.cz - added fix which also backup thinkpad MBR (bnc#464485) Modified: branches/SuSE-Code-11-Branch/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloader... ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/src/clients/bootloader_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/bootloader/src/clients/bootloader_finish.ycp Fri Feb 6 15:36:31 2009 @@ -93,9 +93,9 @@ // where we do a hard reboot. However, the cdrom is still mounted here // and cant be removed. + map finish_ret = nil; if (Arch::s390 ()) { - map finish_ret = nil; string reipl_client = "reipl_bootloader_finish"; // Calling a special reIPL client @@ -106,12 +106,14 @@ } else { y2error ("No such client: %1", reipl_client); } + } + + if (Arch::s390 () && finish_ret["different"]:true == true) + { // reIPL message string ipl_msg = ""; - if (finish_ret["different"]:false == true) { - ipl_msg = finish_ret["ipl_msg"]:""; - } + ipl_msg = finish_ret["ipl_msg"]:""; // SSH modification string usessh_msg = ""; Modified: branches/SuSE-Code-11-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloader... ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-Branch/bootloader/src/routines/misc.ycp Fri Feb 6 15:36:31 2009 @@ -645,23 +645,26 @@ map<string,map> partitions = BootCommon::all_partitions; map<string,map> devices = BootCommon::target_map; - + map partition = $[]; + map device = $[]; string ret = dev; switch(by_mount) { // convert to udev_id case (`id): // partitions - if ((partitions[dev, "udev_id"]:nil != nil) && (partitions[dev, "udev_id", 0]:nil != "")) + partition = partitions[dev]:$[]; + if ((partition["udev_id"]:nil != nil) && (partition["udev_id", 0]:nil != "")) { - ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); + ret = sformat ("/dev/disk/by-id/%1", partition["udev_id", 0]:""); y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); return ret; } // disks - if ((devices[dev, "udev_id"]:nil != nil) && (devices[dev, "udev_id", 0]:nil != "")) + device = devices[dev]:$[]; + if ((device["udev_id"]:nil != nil) && (device["udev_id", 0]:nil != "")) { - ret = sformat ("/dev/disk/by-id/%1", devices[dev, "udev_id", 0]:""); + ret = sformat ("/dev/disk/by-id/%1", device["udev_id", 0]:""); y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); return ret; } @@ -670,16 +673,18 @@ // convert to uuid case (`uuid): // partitions - if ((partitions[dev, "uuid"]:nil != nil) && (partitions[dev, "uuid"]:nil != "")) + partition = partitions[dev]:$[]; + if ((partition["uuid"]:nil != nil) && (partition["uuid"]:nil != "")) { - ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:""); + ret = sformat ("/dev/disk/by-uuid/%1", partition["uuid"]:""); y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); return ret; } // disks - if ((devices[dev, "uuid"]:nil != nil) && (devices[dev, "uuid"]:nil != "")) + device = devices[dev]:$[]; + if ((device["uuid"]:nil != nil) && (device["uuid"]:nil != "")) { - ret = sformat ("/dev/disk/by-uuid/%1", devices[dev, "uuid"]:""); + ret = sformat ("/dev/disk/by-uuid/%1", device["uuid"]:""); y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); return ret; } @@ -688,16 +693,18 @@ // convert to udev_path case (`path): // partitions - if ((partitions[dev, "udev_path"]:nil != nil) && (partitions[dev, "udev_path"]:nil != "")) + partition = partitions[dev]:$[]; + if ((partition["udev_path"]:nil != nil) && (partition["udev_path"]:nil != "")) { - ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:""); + ret = sformat ("/dev/disk/by-path/%1", partition["udev_path"]:""); y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); return ret; } // disks - if ((devices[dev, "udev_path"]:nil != nil) && (devices[dev, "udev_path"]:nil != "")) + device = devices[dev]:$[]; + if ((device["udev_path"]:nil != nil) && (device["udev_path"]:nil != "")) { - ret = sformat ("/dev/disk/by-path/%1", devices[dev, "udev_path"]:""); + ret = sformat ("/dev/disk/by-path/%1", device["udev_path"]:""); y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); return ret; } @@ -706,9 +713,10 @@ // convert to label case (`label): // partitions - if ((partitions[dev, "label"]:nil != nil) && (partitions[dev, "label"]:nil != "")) + partition = partitions[dev]:$[]; + if ((partition["label"]:nil != nil) && (partition["label"]:nil != "")) { - ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); + ret = sformat ("/dev/disk/by-label/%1", partition["label"]:""); y2milestone ("Device name: %1 is converted to label: %2", dev, ret); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org