From 8da89925daf4b1eb59deddd0945c994585c9c768 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 12 Apr 2012 10:15:35 +0100
Subject: inspection: Remove spurious warning for Ubuntu 10.04 with encrypted
 swap (RHBZ#811872). (cherry picked from commit
 96b6504b09461aeb6850bb2e7b870a0a4c2f5edf)

---
 src/inspect_fs_unix.c                     | 2 +-
 tests/guests/guest-aux/make-ubuntu-img.sh | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/inspect_fs_unix.c b/src/inspect_fs_unix.c
index 18072ee3..d4641d5d 100644
--- a/src/inspect_fs_unix.c
+++ b/src/inspect_fs_unix.c
@@ -1162,7 +1162,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map)
   char *device = NULL;
   char *type, *slice, *disk, *part;
 
-  if (STRPREFIX (spec, "/dev/mapper/")) {
+  if (STRPREFIX (spec, "/dev/mapper/") && guestfs_exists (g, spec) > 0) {
     /* LVM2 does some strange munging on /dev/mapper paths for VGs and
      * LVs which contain '-' character:
      *
diff --git a/tests/guests/guest-aux/make-ubuntu-img.sh b/tests/guests/guest-aux/make-ubuntu-img.sh
index 12ed866d..5f110fc2 100755
--- a/tests/guests/guest-aux/make-ubuntu-img.sh
+++ b/tests/guests/guest-aux/make-ubuntu-img.sh
@@ -25,6 +25,9 @@ set -e
 cat > fstab.tmp.$$ <<EOF
 LABEL=BOOT /boot ext2 default 0 0
 /dev/sda2 / ext2 default 1 2
+
+# RHBZ#811872: dummy encrypted swap device
+/dev/mapper/cryptswap1 none swap sw 0 0
 EOF
 
 # lsb-release file.
-- 
cgit