guestfs_h *g;
int read_only = 0;
+int live = 0;
int quit = 0;
int verbose = 0;
int remote_control_listen = 0;
fprintf (stdout,
_("%s: guest filesystem shell\n"
"%s lets you edit virtual machine filesystems\n"
- "Copyright (C) 2009-2010 Red Hat Inc.\n"
+ "Copyright (C) 2009-2011 Red Hat Inc.\n"
"Usage:\n"
" %s [--options] cmd [: cmd : cmd ...]\n"
- " %s [--ro] -i -a disk-image\n"
- " %s [--ro] -i -d libvirt-domain\n"
- "or for interactive use:\n"
- " %s\n"
- "or from a shell script:\n"
- " %s <<EOF\n"
- " cmd\n"
- " ...\n"
- " EOF\n"
"Options:\n"
" -h|--cmd-help List available commands\n"
" -h|--cmd-help cmd Display detailed help on 'cmd'\n"
" -i|--inspector Automatically mount filesystems\n"
" --keys-from-stdin Read passphrases from stdin\n"
" --listen Listen for remote commands\n"
- " -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
+ " --live Connect to a live virtual machine\n"
+ " -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -N|--new type Create prepared disk (test1.img, ...)\n"
" --progress-bars Enable progress bars even when not interactive\n"
" --selinux Enable SELinux support\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
+ " -w|--rw Mount read-write\n"
" -x Echo each command before executing it\n"
+ "\n"
+ "To examine a disk image, ISO, hard disk, filesystem etc:\n"
+ " %s [--ro|--rw] -i -a /path/to/disk.img\n"
+ "or\n"
+ " %s [--ro|--rw] -i -d name-of-libvirt-domain\n"
+ "\n"
+ "--ro recommended to avoid any writes to the disk image. If -i option fails\n"
+ "run again without -i and use 'run' + 'list-filesystems' + 'mount' cmds.\n"
+ "\n"
"For more information, see the manpage %s(1).\n"),
program_name, program_name, program_name,
program_name, program_name, program_name,
- program_name, program_name, program_name);
+ program_name);
}
exit (status);
}
bindtextdomain (PACKAGE, LOCALEBASEDIR);
textdomain (PACKAGE);
+ parse_config ();
+
set_up_terminal ();
enum { HELP_OPTION = CHAR_MAX + 1 };
{ "inspector", 0, 0, 'i' },
{ "keys-from-stdin", 0, 0, 0 },
{ "listen", 0, 0, 0 },
+ { "live", 0, 0, 0 },
{ "mount", 1, 0, 'm' },
{ "new", 1, 0, 'N' },
{ "no-dest-paths", 0, 0, 'D' },
exit (EXIT_FAILURE);
}
- /* If developing, add ./appliance to the path. Note that libtools
- * interferes with this because uninstalled guestfish is a shell
- * script that runs the real program with an absolute path. Detect
- * that too.
- *
- * BUT if LIBGUESTFS_PATH environment variable is already set by
- * the user, then don't override it.
- */
- if (getenv ("LIBGUESTFS_PATH") == NULL &&
- argv[0] &&
- (argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL))
- guestfs_set_path (g, "appliance:" GUESTFS_DEFAULT_PATH);
-
/* CAUTION: we are careful to modify argv[0] here, only after
* using it just above.
*
format = optarg;
} else if (STREQ (long_options[option_index].name, "csh")) {
remote_control_csh = 1;
+ } else if (STREQ (long_options[option_index].name, "live")) {
+ live = 1;
} else {
fprintf (stderr, _("%s: unknown long option: %s (%d)\n"),
program_name, long_options[option_index].name, option_index);
: (optind >= argc && isatty (0));
if (progress_bars)
- guestfs_set_progress_callback (g, progress_callback, NULL);
+ guestfs_set_event_callback (g, progress_callback,
+ GUESTFS_EVENT_PROGRESS, 0, NULL);
/* Interactive, shell script, or command(s) on the command line? */
if (optind >= argc) {
return 0;
}
-/* Resolve the special "win:..." form for Windows-specific paths.
- * This always returns a newly allocated string which is freed by the
- * caller function in "cmds.c".
+/* Resolve the special "win:..." form for Windows-specific paths. The
+ * generated code calls this for all device or path arguments.
+ *
+ * The function returns a newly allocated string, and the caller must
+ * free this string; else display an error and return NULL.
*/
+static char *win_prefix_drive_letter (char drive_letter, const char *path);
+
char *
-resolve_win_path (const char *path)
+win_prefix (const char *path)
{
char *ret;
size_t i;
+ /* If there is not a "win:..." prefix on the path, return strdup'd string. */
if (STRCASENEQLEN (path, "win:", 4)) {
ret = strdup (path);
if (ret == NULL)
path += 4;
- /* Drop drive letter, if it's "C:". */
- if (STRCASEEQLEN (path, "c:", 2))
- path += 2;
-
- if (!*path) {
- ret = strdup ("/");
+ /* If there is a drive letter, rewrite the path. */
+ if (c_isalpha (path[0]) && path[1] == ':') {
+ char drive_letter = c_tolower (path[0]);
+ /* This returns the newly allocated string. */
+ ret = win_prefix_drive_letter (drive_letter, path + 2);
if (ret == NULL)
+ return NULL;
+ }
+ else if (!*path) {
+ ret = strdup ("/");
+ if (ret == NULL) {
perror ("strdup");
- return ret;
+ return NULL;
+ }
}
-
- ret = strdup (path);
- if (ret == NULL) {
- perror ("strdup");
- return NULL;
+ else {
+ ret = strdup (path);
+ if (ret == NULL) {
+ perror ("strdup");
+ return NULL;
+ }
}
/* Blindly convert any backslashes into forward slashes. Is this good? */
return ret;
}
+static char *
+win_prefix_drive_letter (char drive_letter, const char *path)
+{
+ char **roots = NULL;
+ char **drives = NULL;
+ char **mountpoints = NULL;
+ char *device, *mountpoint, *ret = NULL;
+ size_t i;
+
+ /* Resolve the drive letter using the drive mappings table. */
+ roots = guestfs_inspect_get_roots (g);
+ if (roots == NULL)
+ goto out;
+ if (roots[0] == NULL) {
+ fprintf (stderr, _("%s: to use Windows drive letters, you must inspect the guest (\"-i\" option or run \"inspect-os\" command)\n"),
+ program_name);
+ goto out;
+ }
+ drives = guestfs_inspect_get_drive_mappings (g, roots[0]);
+ if (drives == NULL || drives[0] == NULL) {
+ fprintf (stderr, _("%s: to use Windows drive letters, this must be a Windows guest\n"),
+ program_name);
+ goto out;
+ }
+
+ device = NULL;
+ for (i = 0; drives[i] != NULL; i += 2) {
+ if (c_tolower (drives[i][0]) == drive_letter && drives[i][1] == '\0') {
+ device = drives[i+1];
+ break;
+ }
+ }
+
+ if (device == NULL) {
+ fprintf (stderr, _("%s: drive '%c:' not found. To list available drives do:\n inspect-get-drive-mappings %s\n"),
+ program_name, drive_letter, roots[0]);
+ goto out;
+ }
+
+ /* This drive letter must be mounted somewhere (we won't do it). */
+ mountpoints = guestfs_mountpoints (g);
+ if (mountpoints == NULL)
+ goto out;
+
+ mountpoint = NULL;
+ for (i = 0; mountpoints[i] != NULL; i += 2) {
+ if (STREQ (mountpoints[i], device)) {
+ mountpoint = mountpoints[i+1];
+ break;
+ }
+ }
+
+ if (mountpoint == NULL) {
+ fprintf (stderr, _("%s: to access '%c:', mount %s first. One way to do this is:\n umount-all\n mount %s /\n"),
+ program_name, drive_letter, device, device);
+ goto out;
+ }
+
+ /* Rewrite the path, eg. if C: => /c then C:/foo => /c/foo */
+ if (asprintf (&ret, "%s%s%s",
+ mountpoint, STRNEQ (mountpoint, "/") ? "/" : "", path) == -1) {
+ perror ("asprintf");
+ goto out;
+ }
+
+ out:
+ if (roots)
+ free_strings (roots);
+ if (drives)
+ free_strings (drives);
+ if (mountpoints)
+ free_strings (mountpoints);
+
+ return ret;
+}
+
/* Resolve the special FileIn paths ("-" or "-<<END" or filename).
* The caller (cmds.c) will call free_file_in after the command has
* run which should clean up resources.