diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-18 10:43:52 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-18 10:43:52 +0100 |
| commit | 78029b529ad98769685d607230b70f71832d5906 (patch) | |
| tree | f103cb7252ccca7efc3e39f4400f961d5972937c /daemon/initrd.c | |
| parent | e8c954933b2bfb3bc3ead5a151d49d164f1a8eab (diff) | |
| download | libguestfs-78029b529ad98769685d607230b70f71832d5906.tar.gz libguestfs-78029b529ad98769685d607230b70f71832d5906.tar.xz libguestfs-78029b529ad98769685d607230b70f71832d5906.zip | |
Make /sysroot path configurable.
Currently /sysroot is hard-coded throughout the daemon code.
This patch turns the path into a variable so that we can change
it in future, for example to allow standalone mode to be implemented.
This patch was tested by running all the C API tests successfully.
Diffstat (limited to 'daemon/initrd.c')
| -rw-r--r-- | daemon/initrd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/daemon/initrd.c b/daemon/initrd.c index 7b32a08a..392b811e 100644 --- a/daemon/initrd.c +++ b/daemon/initrd.c @@ -41,14 +41,15 @@ do_initrd_list (char *path) ABS_PATH (path, NULL); /* "zcat /sysroot/<path> | cpio --quiet -it", but path must be quoted. */ - len = 64 + 2 * strlen (path); + len = 64 + sysroot_len + 2 * strlen (path); cmd = malloc (len); if (!cmd) { reply_with_perror ("malloc"); return NULL; } - strcpy (cmd, "zcat /sysroot"); + strcpy (cmd, "zcat "); + strcat (cmd, sysroot); shell_quote (cmd+13, len-13, path); strcat (cmd, " | cpio --quiet -it"); |