summaryrefslogtreecommitdiff
path: root/libfstools/partname.c
diff options
context:
space:
mode:
Diffstat (limited to 'libfstools/partname.c')
-rw-r--r--libfstools/partname.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libfstools/partname.c b/libfstools/partname.c
index 4560125..5d4fde5 100644
--- a/libfstools/partname.c
+++ b/libfstools/partname.c
@@ -85,7 +85,7 @@ static char* get_cmdline_val(const char* name, char* out, int len)
continue;
strncpy(out, &sep[1], len);
- out[len-1] = 0;
+ out[len-1] = '\0';
return out;
}
@@ -120,6 +120,11 @@ static struct volume *partname_volume_find(char *name)
bool found = false;
glob_t gl;
+ if (get_cmdline_val("fstools_ignore_partname", rootparam, sizeof(rootparam))) {
+ if (!strcmp("1", rootparam))
+ return NULL;
+ }
+
if (get_cmdline_val("root", rootparam, sizeof(rootparam))) {
rootdev = rootdevname(rootparam);
/* find partition on same device as rootfs */