From a8ad364a7f7d57967d53c45d232c474016c007af Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Sun, 27 Oct 2002 10:52:54 +0000 Subject: [PATCH] Fix the regexp evilness so that fdisk can (again?) find the device root is on from the root mount path. Spotted by: imp --- sbin/fdisk/fdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 5f1b5f97ca8c..e10929a54890 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -1342,7 +1342,7 @@ get_rootdisk(void) if (statfs("/", &rootfs) == -1) err(1, "statfs(\"/\")"); - if ((rv = regcomp(&re, "^(/dev/.*)(\\d+(s\\d+)?[a-h])?$", + if ((rv = regcomp(&re, "^(/dev/[a-z]+[0-9]+)([sp][0-9]+)?[a-h]?$", REG_EXTENDED)) != 0) errx(1, "regcomp() failed (%d)", rv); if ((rv = regexec(&re, rootfs.f_mntfromname, NMATCHES, rm, 0)) != 0)