X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fguestfsd.c;h=eacbc1dd870c1f79b44ab02c209c2ac887803f8d;hb=ed628d30b05b4f5884f1d2029633cf155bf5e571;hp=eb1e82b4a53b9fc362d9580df6a763b620dbf901;hpb=f5096dd546ac43c7288b3ab7aec1562f070f78f6;p=libguestfs.git

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index eb1e82b..eacbc1d 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -111,6 +111,9 @@ int autosync_umount = 1;
 /* Not used explicitly, but required by the gnulib 'error' module. */
 const char *program_name = "guestfsd";
 
+/* Name of the virtio-serial channel. */
+#define VIRTIO_SERIAL_CHANNEL "/dev/virtio-ports/org.libguestfs.channel.0"
+
 static void
 usage (void)
 {
@@ -236,9 +239,13 @@ main (int argc, char *argv[])
   _umask (0);
 #endif
 
+  /* Make a private copy of /etc/lvm so we can change the config (see
+   * daemon/lvm-filter.c).
+   */
+  copy_lvm ();
+
   /* Connect to virtio-serial channel. */
-  int sock = open ("/dev/virtio-ports/org.libguestfs.channel.0",
-                   O_RDWR | O_CLOEXEC);
+  int sock = open (VIRTIO_SERIAL_CHANNEL, O_RDWR | O_CLOEXEC);
   if (sock == -1) {
     fprintf (stderr,
              "\n"
@@ -253,7 +260,7 @@ main (int argc, char *argv[])
              "output to the libguestfs developers, either in a bug report\n"
              "or on the libguestfs redhat com mailing list.\n"
              "\n");
-    perror ("/dev/virtio-ports/org.libguestfs.channel.0");
+    perror (VIRTIO_SERIAL_CHANNEL);
     exit (EXIT_FAILURE);
   }