svn commit: r335874 - head/stand/zfs

Alexander Motin mav at FreeBSD.org
Mon Jul 2 20:56:18 UTC 2018


Author: mav
Date: Mon Jul  2 20:56:17 2018
New Revision: 335874
URL: https://svnweb.freebsd.org/changeset/base/335874

Log:
  Cut currdev dev and path fields for ZFS on the last colon.
  
  Previously the code cut those fields on second colon, that prevented
  boot from boot environments with colon in their names.  This change
  moves the limitation from dev field to path, which is empty by default.
  
  Reviewed by:	allanjude, tsoome
  MFC after:	2 weeks
  Sponsored by:	iXsystems, Inc.
  Differential Revision:	https://reviews.freebsd.org/D16068

Modified:
  head/stand/zfs/zfs.c

Modified: head/stand/zfs/zfs.c
==============================================================================
--- head/stand/zfs/zfs.c	Mon Jul  2 19:48:38 2018	(r335873)
+++ head/stand/zfs/zfs.c	Mon Jul  2 20:56:17 2018	(r335874)
@@ -662,7 +662,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const char *devs
 	if (*np != ':')
 		return (EINVAL);
 	np++;
-	end = strchr(np, ':');
+	end = strrchr(np, ':');
 	if (end == NULL)
 		return (EINVAL);
 	sep = strchr(np, '/');


More information about the svn-src-head mailing list