git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a0f85ba
)
inspect: Ignore Pardus "/.swap" swapfile.
author
Richard W.M. Jones
<rjones@redhat.com>
Fri, 29 Oct 2010 08:46:59 +0000
(09:46 +0100)
committer
Richard Jones
<rjones@redhat.com>
Fri, 29 Oct 2010 09:15:02 +0000
(10:15 +0100)
src/inspect.c
patch
|
blob
|
history
diff --git
a/src/inspect.c
b/src/inspect.c
index
5bd332f
..
3421baa
100644
(file)
--- 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]);
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);
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)
* we don't care, just ignore it.
*/
if (device == NULL)