summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-10-29 09:46:59 +0100
committerRichard Jones <rjones@redhat.com>2010-10-29 10:15:02 +0100
commit12cf22ade46ba07aa162a311d3369096292d6d02 (patch)
tree31ba905681a621f3af73580289b2178c915f3d54
parenta0f85ba643990da25b6afe6a2bbd2407cf312c73 (diff)
downloadlibguestfs-12cf22ade46ba07aa162a311d3369096292d6d02.tar.gz
libguestfs-12cf22ade46ba07aa162a311d3369096292d6d02.tar.xz
libguestfs-12cf22ade46ba07aa162a311d3369096292d6d02.zip
inspect: Ignore Pardus "/.swap" swapfile.
-rw-r--r--src/inspect.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/inspect.c b/src/inspect.c
index 5bd332fb..3421baaf 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -843,11 +843,12 @@ add_fstab_entry (guestfs_h *g, struct inspect_fs *fs,
device = guestfs_findfs_uuid (g, &spec[5]);
else if (STRPREFIX (spec, "LABEL="))
device = guestfs_findfs_label (g, &spec[6]);
- /* Resolve guest block device names. */
- else if (spec[0] == '/')
+ /* Ignore "/.swap" (Pardus) and pseudo-devices like "tmpfs". */
+ else if (STRPREFIX (spec, "/dev/"))
+ /* Resolve guest block device names. */
device = resolve_fstab_device (g, spec);
- /* Also ignore pseudo-devices completely, like spec == "tmpfs".
- * If we haven't resolved the device successfully by this point,
+
+ /* If we haven't resolved the device successfully by this point,
* we don't care, just ignore it.
*/
if (device == NULL)