Author: juhliarik Date: Fri Aug 8 16:23:03 2008 New Revision: 49877 URL: http://svn.opensuse.org/viewcvs/yast?rev=49877&view=rev Log: - reimmplementation converting to persistent device names and back M bootloader/src/modules/BootCommon.ycp * added support converting devices * added support for exporting M bootloader/src/routines/misc.ycp * added function for converting: + remapDeviceMap(map device_map) + remapGlobals(map globals_set) + remapResume(string append) + remapSections(list >sec) Modified: trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=49877&r1=49876&r2=49877&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Aug 8 16:23:03 2008 @@ -466,7 +466,7 @@ : ""; // try to use label or udev id for device name... FATE #302219 if ((resume != "") && (resume != nil)) - resume = DevToLabelUdevID(resume); + resume = Dev2MountByDev(resume); // FIXME: @@ -589,7 +589,7 @@ "image" : kernel_fn, "initrd" : initrd_fn, // try to use label or udev id for device name... FATE #302219 - "root" : DevToLabelUdevID(RootPartitionDevice), + "root" : Dev2MountByDev(RootPartitionDevice), "append" : (title == "failsafe") ? BootArch::FailsafeKernelParams () : BootArch::DefaultKernelParams (resume), @@ -633,10 +633,11 @@ * @return bootloader settings */ global define map Export () { + MapDevices(); map exp = $[ - "global": globals, - "sections" : sections, - "device_map" : device_mapping, + "global": remapGlobals(globals), + "sections" : remapSections(sections), + "device_map" : remapDeviceMap(device_mapping), ]; if ( ! ( loader_type == "grub" ) ) { exp["repl_mbr"] = repl_mbr; @@ -703,8 +704,7 @@ k = Storage::SLES9PersistentDevNames(k); y2milestone( "devmap: dev name after SLES9 persistent dev name translation: %1", k); } - //return $[BootCommon::MountByDev2Dev(k) : v]; - return $[DevToLabelUdevID(k) : v]; + return $[Dev2MountByDev(k) : v]; }); // convert custom boot device names in globals to the kernel device names @@ -717,8 +717,7 @@ v = Storage::SLES9PersistentDevNames(v); y2milestone( "globals: dev name after SLES9 persistent dev name translation: %1", v); } - //return $[k : BootCommon::MountByDev2Dev(v)]; - return $[k : DevToLabelUdevID(v)]; + return $[k : Dev2MountByDev(v)]; } else { return $[k : v]; } @@ -734,8 +733,7 @@ rdev = Storage::SLES9PersistentDevNames(rdev); y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev); } - //s["root"] = BootCommon::MountByDev2Dev(rdev); - s["root"] = DevToLabelUdevID(rdev); + s["root"] = Dev2MountByDev(rdev); return s; }); return true; @@ -816,7 +814,7 @@ map my_globals = mapmap (string k , string v, globals, { if ( k == "stage1_dev" || regexpmatch(k, "^boot_.*custom$" ) ) //return $[k : BootCommon::Dev2MountByDev(v)]; - return $[k : BootCommon::DevToLabelUdevID(v)]; + return $[k : BootCommon::Dev2MountByDev(v)]; else return $[k : v]; }); @@ -826,7 +824,7 @@ map my_device_mapping = mapmap (string k , string v, device_mapping, { //return $[BootCommon::Dev2MountByDev(k) : v]; - return $[BootCommon::DevToLabelUdevID(k) : v]; + return $[BootCommon::Dev2MountByDev(k) : v]; }); ret = ret && SetDeviceMap (my_device_mapping); Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=49877&r1=49876&r2=49877&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Fri Aug 8 16:23:03 2008 @@ -159,17 +159,7 @@ return pth; } - /** - * Converts a "/dev/disk/by-" device name to the corresponding kernel - * device name, if a mapping for this name can be found in the map from - * yast2-storage. If the given device name is not a "/dev/disk/by-" device - * name, it is left unchanged. Also, if the information about the device - * name cannot be found in the target map from yast2-storage, the device - * name is left unchanged. - * - * @param dev string device name - * @return string kernel device name - */ +/* global define string MountByDev2Dev(string dev) ``{ y2milestone ("MountByDev2Dev: %1", dev); @@ -212,17 +202,282 @@ y2milestone ("MountByDev2Dev: ret %1", ret); return ret; } +*/ +global map uuid_partitions = $[]; +global map id_partitions = $[]; +global map label_partitions = $[]; +global map path_partitions = $[]; + +global map uuid_disks = $[]; +global map id_disks = $[]; +global map path_disks = $[]; + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Function prepare maps with mapping disks and partitions by uuid, id, path + * and label. + * + */ - /** - * Converts a device name to the corresponding device name it should be - * mounted by, according to the "mountby" setting for the device from - * yast2-storage. As a safeguard against problems, if the "mountby" device - * name does not exist in the information from yast2-storage, it will - * fallback to the "kernel name" ("/dev/hda1"). - * - * @param dev string device name - * @return string device name according to "mountby" - */ +global void MapDevices() +{ + string dev_by_something = ""; + map devices = (map)Storage::GetTargetMap(); + foreach (string k, map v, devices, + { + // map disk by uuid + if ((v["uuid"]:nil != "") && (v["uuid"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-uuid/"+v["uuid"]:""; + uuid_disks[dev_by_something]= k; + } + // map disk by path + if ((v["path"]:nil != "") && (v["path"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-path/"+v["path"]:""; + path_disks[dev_by_something]= k; + } + // map disk by id + if ((v["udev_id"]:nil != nil) && (v["udev_id", 0]:nil != "")) + { + dev_by_something = "/dev/disk/by-id/"+v["udev_id", 0]:""; + id_disks[dev_by_something] = k; + } + // map partitions from disk... + + foreach (map p, (list<map>)(v["partitions"]:[]), + { + // map partition by uuid + if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-uuid/"+p["uuid"]:""; + uuid_partitions[dev_by_something]= p["device"]:""; + } + + // map partition by path + if ((p["path"]:nil != "") && (p["path"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-path/"+p["path"]:""; + path_partitions[dev_by_something]= p["device"]:""; + } + + // map partition by path + if ((p["label"]:nil != "") && (p["label"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-label/"+p["label"]:""; + label_partitions[dev_by_something]= p["device"]:""; + } + + // map disk by id + if ((p["udev_id"]:nil != nil) && (p["udev_id", 0]:nil != "")) + { + dev_by_something = "/dev/disk/by-id/"+p["udev_id", 0]:""; + id_partitions[dev_by_something] = p["device"]:""; + } + + }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), + }); // end of foreach (string k, map v, devices, + + y2milestone("disks mapping by-id: %1", id_disks); + y2milestone("disks mapping by-uuid: %1", uuid_disks); + y2milestone("disks mapping by-path: %1", path_disks); + + y2milestone("partitions mapping by-id: %1", id_partitions); + y2milestone("partitions mapping by-uuid: %1", uuid_partitions); + y2milestone("partitions mapping by-path: %1", path_partitions); + y2milestone("partitions mapping by-label: %1", label_partitions); +} + + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a "/dev/disk/by-" device name to the corresponding kernel + * device name, if a mapping for this name can be found in the map from + * yast2-storage. If the given device name is not a "/dev/disk/by-" device + * name, it is left unchanged. Also, if the information about the device + * name cannot be found in the target map from yast2-storage, the device + * name is left unchanged. + * + * @param dev string device name + * @return string kernel device name + */ + +global define string MountByDev2Dev(string dev) +{ + y2milestone ("MountByDev2Dev: %1", dev); + + if (!regexpmatch(dev, "^/dev/disk/by-")) + return dev; + string ret = dev; + + // check if it is device name by id + if (search(dev, "/dev/disk/by-id/") != nil) + { + if (haskey(id_partitions, dev)) + ret = id_partitions[dev]:""; + + if (haskey(id_disks, dev)) + ret = id_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by uuid + if (search(dev, "/dev/disk/by-uuid/") != nil) + { + if (haskey(uuid_partitions, dev)) + ret = uuid_partitions[dev]:""; + + if (haskey(uuid_disks, dev)) + ret = uuid_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by path + if (search(dev, "/dev/disk/by-path/") != nil) + { + if (haskey(path_partitions, dev)) + ret = path_partitions[dev]:""; + + if (haskey(path_disks, dev)) + ret = path_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by label + // only partition are supported + if (search(dev, "/dev/disk/by-label/") != nil) + { + if (haskey(label_partitions, dev)) + ret = label_partitions[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; +} +/** + * Function remap device map to device name (/dev/sda) + * or to label (ufo_disk) + * @param map device map + * @return map new device map + */ + +global map remapDeviceMap(map device_map) +{ + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + if (by_mount == `label) + return device_map; + + map ret = $[]; + // convert device names in device map to the device names by device or label + ret = mapmap (string k , string v, device_mapping, + { + return $[BootCommon::MountByDev2Dev(k) : v]; + }); + + return ret; +} + +/** + * Function remap globals settings "boot_custom" device name (/dev/sda) + * or to label (ufo_partition) + * @param map globals + * @return map globals + */ + +global map remapGlobals(map globals_set) +{ + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + if (by_mount == `label) + return globals_set; + + if (haskey(globals_set, "boot_custom")) + { + globals_set["boot_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_custom"]:""); + } + + return globals_set; +} + +/** + * Function remap "resume" from section (append) to device name (/dev/sda) + * or to label (ufo_partition) + * @param map sections + * @return map sections + */ + +define string remapResume(string append) +{ + if ((search(append, "resume")!=nil) && (search(append, "noresume") == nil)) + { + list <string> list_append = splitstring (append, " "); + list_append = add(list_append, foreach(string key, list_append, + { + if (search(key,"resume") != nil) + { + list <string> resume_arg = splitstring(key, "="); + string dev = resume_arg[1]:""; + if (dev != "") + return "resume="+BootCommon::MountByDev2Dev(dev); + else + return key; + } else { + return key; + } + })); + + string ret = mergestring(list_append, " "); + return ret; + + } else { + return append; + } +} + +/** + * Function remap section "root" and "resume" to device name (/dev/sda) + * or to label (ufo_partition) + * @param list > list of sections + * @return list > list of sections + */ + +global list > remapSections(list >sec) +{ + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + if (by_mount == `label) + return sec; + + list >temp_sec = []; + + // convert root and resume device names in sections to kernel device names + temp_sec = maplist (map s, sections, + { + + if (s["root"]:"" != "") + { + string rdev = s["root"]:""; + s["root"] = BootCommon::MountByDev2Dev(rdev); + + if (s["append"]:"" != "") + s["append"] = remapResume(s["append"]:""); + } + + if (s["chainloader"]:"" != "") + s["chainloader"] = BootCommon::MountByDev2Dev(s["chainloader"]:""); + + return s; + }); + + return temp_sec; +} + + +/* global define string Dev2MountByDev(string dev) ``{ y2milestone ("Dev2MountByDev: %1", dev); map devices = (map)Storage::GetTargetMap(); @@ -257,6 +512,119 @@ y2milestone ("Dev2MountByDev: ret %1", ret); return ret; } +*/ +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a device name to the corresponding device name it should be + * mounted by, according to the "mountby" setting for the device from + * yast2-storage. As a safeguard against problems, if the "mountby" device + * name does not exist in the information from yast2-storage, it will + * fallback to the "kernel name" ("/dev/sdXY"). + * + * @param dev string device name + * @return string device name according to "mountby" + */ +global define string Dev2MountByDev(string dev) +{ + y2milestone ("Dev2MountByDev: %1", dev); + + // (`id,`uuid,`path,`device,`label) + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + y2milestone("Default mount by is %1", by_mount); + + map devices = (map)Storage::GetTargetMap(); + + // make a map: "/dev/hda1" -> info_map_for_this_partition + map partitions = $[]; + foreach (string k, map v, devices, + { + foreach (map p, (list<map>)(v["partitions"]:[]), + { + partitions[p["device"]:""] = p; + }); + }); + + 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 != "")) + { + ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "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 != "")) + { + ret = sformat ("/dev/disk/by-id/%1", devices[dev, "udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + return ret; + } + break; + + // convert to uuid + case (`uuid): + // partitions + if ((partitions[dev, "uuid"]:nil != nil) && (partitions[dev, "uuid"]:nil != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "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 != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", devices[dev, "uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + return ret; + } + break; + + // convert to udev_path + case (`path): + // partitions + if ((partitions[dev, "udev_path"]:nil != nil) && (partitions[dev, "udev_path"]:nil != "")) + { + ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "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 != "")) + { + ret = sformat ("/dev/disk/by-path/%1", devices[dev, "udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + return ret; + } + break; + + // convert to label + case (`label): + // partitions + if ((partitions[dev, "label"]:nil != nil) && (partitions[dev, "label"]:nil != "")) + { + ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); + y2milestone ("Device name: %1 is converted to label: %2", dev, ret); + return ret; + } + // disks + y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", dev, ret); + return ret; + break; + + // convert to device or uknown type + default: + y2milestone ("Convert %1 to `device or unknwn type, result: %2", dev, ret); + return ret; + break; + } + + return ret; +} + /** * Converts a device name to the label (if it used) than try to udev id (if it used) @@ -1599,7 +1967,7 @@ string boot_disk = p_dev["disk"]:""; - device = DevToLabelUdevID(boot_disk); + device = Dev2MountByDev(boot_disk); y2milestone("Boot disk is %1 and his udev id is: %2", boot_disk, device); return device; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org