Libguestfs - Oct 2010 - [PATCH] inspection: Ignore floppy disks and CD-ROM drives (RHBZ#642929).

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
-------------- next part --------------
>From b6a39d390d7046cde25429778710c4782288d84a Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Tue, 26 Oct 2010 09:56:55 +0100
Subject: [PATCH] inspection: Ignore floppy disks and CD-ROM drives
(RHBZ#642929).

---
 src/inspect.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/inspect.c b/src/inspect.c
index 3ffb2bd..992573a 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -31,6 +31,7 @@
 #include <hivex.h>
 #include <augeas.h>
 
+#include "c-ctype.h"
 #include "ignore-value.h"
 #include "xstrtol.h"
 
@@ -831,6 +832,12 @@ add_fstab_entry (guestfs_h *g, struct inspect_fs *fs,
       STREQ (mp, "/sys"))
     return 0;
 
+  /* Ignore /dev/fd (floppy disks) (RHBZ#642929) and CD-ROM drives. */
+  if ((STRPREFIX (spec, "/dev/fd") && c_isdigit (spec[7])) ||
+      STREQ (spec, "/dev/floppy") ||
+      STREQ (spec, "/dev/cdrom"))
+    return 0;
+
   /* Resolve UUID= and LABEL= to the actual device. */
   char *device = NULL;
   if (STRPREFIX (spec, "UUID="))
-- 
1.7.3.1