From 57926c8c5566f0ef5b77db326d58aa0643cf6270 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 9 Aug 2008 22:37:58 -0400 Subject: [PATCH] blkid: Fix probing logic so we find renamed devices This fixes a bug where if there is an entry in the /etc/blkid.tab file for a particular device (major, minor) number but the filename does not exist, blkid wouldn't try to find the correct filename. Addresses-Debian-Bug: #493216 --- lib/blkid/devname.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c index 65c6cca..89b33f2 100644 --- a/lib/blkid/devname.c +++ b/lib/blkid/devname.c @@ -142,10 +142,12 @@ static void probe_one(blkid_cache cache, const char *ptname, continue; #endif if (tmp->bid_devno == devno) { - if (only_if_new) + if (only_if_new && !access(tmp->bid_name, F_OK)) return; dev = blkid_verify(cache, tmp); - break; + if (dev && (dev->bid_flags & BLKID_BID_FL_VERIFIED)) + break; + dev = 0; } } if (dev && dev->bid_devno == devno) -- 1.8.3.1