git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
daemon
/
lvm-filter.c
diff --git
a/daemon/lvm-filter.c
b/daemon/lvm-filter.c
index
e487c6b
..
a62d40a
100644
(file)
--- a/
daemon/lvm-filter.c
+++ b/
daemon/lvm-filter.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2010 Red Hat Inc.
+ * Copyright (C) 2010
-2011
Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-56,9
+56,6
@@
is_filter_line (const char *line)
static int
set_filter (const char *filter)
{
static int
set_filter (const char *filter)
{
- if (verbose)
- fprintf (stderr, "LVM: setting device filter to %s\n", filter);
-
FILE *ifp = fopen ("/etc/lvm/lvm.conf", "r");
if (ifp == NULL) {
reply_with_perror ("open: /etc/lvm/lvm.conf");
FILE *ifp = fopen ("/etc/lvm/lvm.conf", "r");
if (ifp == NULL) {
reply_with_perror ("open: /etc/lvm/lvm.conf");
@@
-76,8
+73,6
@@
set_filter (const char *filter)
while (getline (&line, &len, ifp) != -1) {
int r;
if (is_filter_line (line)) {
while (getline (&line, &len, ifp) != -1) {
int r;
if (is_filter_line (line)) {
- if (verbose)
- fprintf (stderr, "LVM: replacing config line:\n%s", line);
r = fprintf (ofp, " filter = [ %s ]\n", filter);
} else {
r = fprintf (ofp, "%s", line);
r = fprintf (ofp, " filter = [ %s ]\n", filter);
} else {
r = fprintf (ofp, "%s", line);
@@
-122,7
+117,7
@@
vgchange (const char *vgchange_flag)
char *err;
int r = command (NULL, &err, "lvm", "vgchange", vgchange_flag, NULL);
if (r == -1) {
char *err;
int r = command (NULL, &err, "lvm", "vgchange", vgchange_flag, NULL);
if (r == -1) {
- reply_with_error ("vg
scan
: %s", err);
+ reply_with_error ("vg
change
: %s", err);
free (err);
return -1;
}
free (err);
return -1;
}