diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-09-22 10:41:05 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-09-22 11:03:22 +0100 |
| commit | 1e9e6e50bd1bb81524185d8e32e3b787dead965b (patch) | |
| tree | 766ed0e9907ac1704b23a55df05ea445d2d2f96a /src/guestfs.c | |
| parent | 419cf4bb01727a8b0f23f48199a2831df6c6650e (diff) | |
| download | libguestfs-1e9e6e50bd1bb81524185d8e32e3b787dead965b.tar.gz libguestfs-1e9e6e50bd1bb81524185d8e32e3b787dead965b.tar.xz libguestfs-1e9e6e50bd1bb81524185d8e32e3b787dead965b.zip | |
Change handling of spaces on Linux kernel command line.
Diffstat (limited to 'src/guestfs.c')
| -rw-r--r-- | src/guestfs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/guestfs.c b/src/guestfs.c index 17e2c7cd..6eafcf5b 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -1067,7 +1067,7 @@ guestfs__launch (guestfs_h *g) add_cmdline (g, "user,vlan=0,net=10.0.2.0/8"); snprintf (buf, sizeof buf, - "guestfs_vmchannel=tcp:10.0.2.2:%d ", null_vmchannel_sock); + "guestfs_vmchannel=tcp:10.0.2.2:%d", null_vmchannel_sock); vmchannel = strdup (buf); } @@ -1097,7 +1097,7 @@ guestfs__launch (guestfs_h *g) add_cmdline (g, "-net"); add_cmdline (g, buf); - vmchannel = "guestfs_vmchannel=tcp:" GUESTFWD_ADDR ":" GUESTFWD_PORT " "; + vmchannel = "guestfs_vmchannel=tcp:" GUESTFWD_ADDR ":" GUESTFWD_PORT; } /* Not guestfwd. HOPEFULLY this qemu uses the older -net channel @@ -1112,7 +1112,7 @@ guestfs__launch (guestfs_h *g) add_cmdline (g, "-net"); add_cmdline (g, "user,vlan=0,net=10.0.2.0/8"); - vmchannel = "guestfs_vmchannel=tcp:" GUESTFWD_ADDR ":" GUESTFWD_PORT " "; + vmchannel = "guestfs_vmchannel=tcp:" GUESTFWD_ADDR ":" GUESTFWD_PORT; } add_cmdline (g, "-net"); add_cmdline (g, "nic,model=" NET_IF ",vlan=0"); @@ -1128,13 +1128,13 @@ guestfs__launch (guestfs_h *g) /* Linux kernel command line. */ snprintf (buf, sizeof buf, LINUX_CMDLINE - "%s" /* (selinux) */ - "%s" /* (vmchannel) */ - "%s" /* (verbose) */ + "%s " /* (selinux) */ + "%s " /* (vmchannel) */ + "%s " /* (verbose) */ "%s", /* (append) */ - g->selinux ? "selinux=1 enforcing=0 " : "selinux=0 ", + g->selinux ? "selinux=1 enforcing=0" : "selinux=0", vmchannel ? vmchannel : "", - g->verbose ? "guestfs_verbose=1 " : "", + g->verbose ? "guestfs_verbose=1" : "", g->append ? g->append : ""); add_cmdline (g, "-kernel"); |