projects / packages / util-linux.git / blame
| Commit | Line | Data |
|---|---|---|
| 5545a732 JR |
1 | - At boot time, fsck chokes on LVs listed by label in fstab |
| 2 | ||
| 3 | --- util-linux-2.12p/mount/mount_by_label.c.lvm2dupes 2005-04-25 11:33:53.657880224 +0200 | |
| 4 | +++ util-linux-2.12p/mount/mount_by_label.c 2005-04-25 11:36:32.075797040 +0200 | |
| 5 | @@ -195,6 +195,15 @@ | |
| 6 | return 1; | |
| 7 | } | |
| 8 | ||
| 9 | +/* We need to avoid listing /dev/dm-X devices, because they are added to the uuidcache separately by the | |
| 10 | + uuidcache_init_dm routine. Duplicate entries cause mount-by-label to fail. | |
| 11 | + */ | |
| 12 | +static int | |
| 13 | +is_lvm2(char *ptname) | |
| 14 | +{ | |
| 15 | + return !strncmp(ptname, "dm-", 3); | |
| 16 | +} | |
| 17 | + | |
| 18 | static void | |
| 19 | uuidcache_init(void) { | |
| 20 | char line[100]; | |
| 21 | @@ -266,7 +275,7 @@ | |
| 22 | /* devfs has .../disc and .../part1 etc. */ | |
| 23 | ||
| 24 | for (s = ptname; *s; s++); | |
| 25 | - if (isdigit(s[-1]) || is_xvm(ptname)) { | |
| 26 | + if ((isdigit(s[-1]) || is_xvm(ptname)) && !is_lvm2(ptname)) { | |
| 27 | ||
| 28 | /* | |
| 29 | * Note: this is a heuristic only - there is no reason |