diff options
| author | phk <phk@FreeBSD.org> | 2002-10-27 10:52:54 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-10-27 10:52:54 +0000 |
| commit | 4a5e62a6e71f30d5c39185e90a68408ba9fc2deb (patch) | |
| tree | 189333b1b66e8cd8d8cb7db0446b70f1ebe889e7 /sbin/fdisk | |
| parent | dd9e331ae288a8ca739bb13755c0849aa4793249 (diff) | |
| download | FreeBSD-src-4a5e62a6e71f30d5c39185e90a68408ba9fc2deb.zip FreeBSD-src-4a5e62a6e71f30d5c39185e90a68408ba9fc2deb.tar.gz | |
Fix the regexp evilness so that fdisk can (again?) find the device
root is on from the root mount path.
Spotted by: imp
Diffstat (limited to 'sbin/fdisk')
| -rw-r--r-- | sbin/fdisk/fdisk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 5f1b5f9..e10929a 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) |
