d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GEOM: Fix regression after 7f16b501e25.

Browse Source 
find_geom() in some classes trim leading "/dev/" from geom names.
Lack of that in geom_gettree_geom() broke some existing scripts.

PR:		262554
MFC after:	2 months
This commit is contained in:
Alexander Motin 2022-03-15 23:58:09 -04:00
parent f6f357efb1
commit bd0f3d34fa
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libgeom/geom_xml2tree.c
View File

@ -37,6 +37,7 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <paths.h>
#include <fcntl.h>
#include <ctype.h>
#include <sys/stat.h>
@ -481,6 +482,8 @@ geom_gettree_geom(struct gmesh *gmp, const char *c, const char *g, int parents)
char *p;
int error;
if (g != NULL && strncmp(g, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
g += sizeof(_PATH_DEV) - 1;
p = geom_getxml_geom(c, g, parents);
if (p == NULL)
return (errno);