X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.c;h=c4036919bdf7e9ff05f4afa9389c96137d5bc8c3;hp=8e2a3610bee7b00a163bb15619fa6a36121c0962;hb=a58922346e06b827d4a81a33ce90f923dc103fde;hpb=dc13479d33efc6cf4b55bfd7b4875c44e4a9bbd0 diff --git a/discover/paths.c b/discover/paths.c index 8e2a361..c403691 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -58,9 +58,9 @@ char *encode_label(void *alloc_ctx, const char *label) } char *parse_device_path(void *alloc_ctx, - const char *dev_str, const char *cur_dev) + const char *dev_str, const char __attribute__((unused)) *cur_dev) { - char *dev, tmp[256], *enc; + char *dev, *enc; if (is_prefix_ignorecase(dev_str, "uuid=")) { dev = talloc_asprintf(alloc_ctx, "/dev/disk/by-uuid/%s", @@ -81,14 +81,6 @@ char *parse_device_path(void *alloc_ctx, if (is_prefix(dev_str, "/dev/")) dev_str += strlen("/dev/"); - /* PS3 hack: if we're reading from a ps3dx device, and we refer to - * a sdx device, remap to ps3dx */ - if (cur_dev && is_prefix(cur_dev, "/dev/ps3d") - && is_prefix(dev_str, "sd")) { - snprintf(tmp, 255, "ps3d%s", dev_str + 2); - dev_str = tmp; - } - return join_paths(alloc_ctx, "/dev", dev_str); }