emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device matching against UUIDs: do not try floppies

Browse Source 
function                                             old     new   delta
uuidcache_check_device                               255     292     +37

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-06-27 21:58:25 +02:00
parent eb1cda2f2d
commit 4fc5ec56f9
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util-linux/volume_id/get_devname.c
View File

@ -86,9 +86,16 @@ uuidcache_check_device(const char *device,
char *label = label; char *label = label;
int fd; int fd;
/* note: this check rejects links to devices, among other nodes */
if (!S_ISBLK(statbuf->st_mode)) if (!S_ISBLK(statbuf->st_mode))
return TRUE; return TRUE;
/* Users report that mucking with floppies (especially non-present
* ones) is significant PITA. This is a horribly dirty hack,
* but it is very useful in real world. */
if (major(statbuf->st_rdev) == 2)
return TRUE;
fd = open(device, O_RDONLY); fd = open(device, O_RDONLY);
if (fd < 0) if (fd < 0)
return TRUE; return TRUE;