From: Brian Norris Date: Sat, 7 Jan 2023 02:04:22 +0000 (-0800) Subject: partname: Ignore root=PARTUUID... X-Git-Url: http://git.openwrt.org/?p=project%2Ffstools.git;a=commitdiff_plain;h=e9b59f063bb333df6d58bf434554753d123a713f partname: Ignore root=PARTUUID... We're assuming all root= arguments are /dev/ paths, but many targets utilize root=PARTUUID= strategies. At least allow them to fall back to scanning all block devices. Signed-off-by: Brian Norris --- diff --git a/libfstools/partname.c b/libfstools/partname.c index f59c52e..9c27015 100644 --- a/libfstools/partname.c +++ b/libfstools/partname.c @@ -128,12 +128,12 @@ static struct volume *partname_volume_find(char *name) return NULL; } - if (get_var_from_file("/proc/cmdline", "root", rootparam, sizeof(rootparam))) { + if (get_var_from_file("/proc/cmdline", "root", rootparam, sizeof(rootparam)) && rootparam[0] == '/') { rootdev = rootdevname(rootparam); /* find partition on same device as rootfs */ snprintf(ueventgstr, sizeof(ueventgstr), "%s/%s/*/uevent", block_dir_name, rootdev); } else { - /* no 'root=' kernel cmdline parameter, find on any block device */ + /* no useful 'root=' kernel cmdline parameter, find on any block device */ snprintf(ueventgstr, sizeof(ueventgstr), "%s/*/uevent", block_dir_name); }