/* virt-rescue
- * 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
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <inttypes.h>
#include <unistd.h>
#include <getopt.h>
#include <errno.h>
+#include <locale.h>
#include <assert.h>
+#include <libintl.h>
+#include "ignore-value.h"
#include "progname.h"
#include "xvasprintf.h"
" --selinux Enable SELinux\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
+ " -w|--rw Mount read-write\n"
" -x Trace libguestfs API calls\n"
"For more information, see the manpage %s(1).\n"),
program_name, program_name, program_name,
bindtextdomain (PACKAGE, LOCALEBASEDIR);
textdomain (PACKAGE);
+ parse_config ();
+
enum { HELP_OPTION = CHAR_MAX + 1 };
static const char *options = "a:c:d:m:rvVx";
{ "memsize", 1, 0, 'm' },
{ "network", 0, 0, 0 },
{ "ro", 0, 0, 'r' },
+ { "rw", 0, 0, 'w' },
{ "selinux", 0, 0, 0 },
{ "verbose", 0, 0, 'v' },
{ "version", 0, 0, 'V' },
OPTION_V;
break;
+ case 'w':
+ OPTION_w;
+ break;
+
case 'x':
OPTION_x;
break;
* appliance.
*/
guestfs_set_error_handler (g, NULL, NULL);
- guestfs_launch (g);
- /* launch() expects guestfsd to start. However, virt-rescue doesn't
- * run guestfsd, so this will always fail with ECHILD when the
- * appliance exits unexpectedly.
- */
- if (errno != ECHILD) {
- fprintf (stderr, "%s: %s\n", program_name, guestfs_last_error (g));
- guestfs_close (g);
- exit (EXIT_FAILURE);
- }
+ /* We expect launch to fail, so ignore the return value. */
+ ignore_value (guestfs_launch (g));
guestfs_close (g);