svn commit: r212724 - head/sbin/fdisk

[Brian Somers]

Author: brian
Date: Thu Sep 16 08:16:53 2010
New Revision: 212724
URL: http://svn.freebsd.org/changeset/base/212724

Log:
  Add support for identifying a journaled root filesystem.
  Fix support for identifying the given /dev/vinum/root example.
  
  MFC after:	3 weeks

Modified:
  head/sbin/fdisk/fdisk.c

Modified: head/sbin/fdisk/fdisk.c
==============================================================================
--- head/sbin/fdisk/fdisk.c	Thu Sep 16 07:56:34 2010	(r212723)
+++ head/sbin/fdisk/fdisk.c	Thu Sep 16 08:16:53 2010	(r212724)
@@ -1462,6 +1462,7 @@ sanitize_partition(struct dos_partition 
  *   /dev/da0a       => /dev/da0
  *   /dev/vinum/root => /dev/vinum/root
  * A ".eli" part is removed if it exists (see geli(8)).
+ * A ".journal" ending is removed if it exists (see gjournal(8)).
  */
 static char *
 get_rootdisk(void)
@@ -1476,7 +1477,7 @@ get_rootdisk(void)
 	if (statfs("/", &rootfs) == -1)
 		err(1, "statfs(\"/\")");
 
-	if ((rv = regcomp(&re, "^(/dev/[a-z/]+[0-9]+)([sp][0-9]+)?[a-h]?$",
+	if ((rv = regcomp(&re, "^(/dev/[a-z/]+[0-9]*)([sp][0-9]+)?[a-h]?(\\.journal)?$",
 		    REG_EXTENDED)) != 0)
 		errx(1, "regcomp() failed (%d)", rv);
 	strlcpy(dev, rootfs.f_mntfromname, sizeof (dev));