@@ -193,10 +193,15 @@ static int __init root_nfs_parse_options(char *incoming, char *exppath,
* @incoming now points to the rest of the string; if it
* contains something, append it to our root options buffer
*/
- if (incoming != NULL && *incoming != '\0')
+ if (incoming != NULL && *incoming != '\0') {
+ if (nfs_root_options[0] != '\0' &&
+ root_nfs_cat(nfs_root_options, ",",
+ sizeof(nfs_root_options)))
+ return -1;
if (root_nfs_cat(nfs_root_options, incoming,
sizeof(nfs_root_options)))
return -1;
+ }
/*
* Possibly prepare for more options to be appended