git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
rescue
/
virt-rescue.c
diff --git
a/rescue/virt-rescue.c
b/rescue/virt-rescue.c
index
3ae28e3
..
911b80a
100644
(file)
--- a/
rescue/virt-rescue.c
+++ b/
rescue/virt-rescue.c
@@
-1,5
+1,5
@@
/* virt-rescue
/* 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
*
* 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
@@
-20,11
+20,14
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <inttypes.h>
#include <unistd.h>
#include <getopt.h>
#include <errno.h>
#include <inttypes.h>
#include <unistd.h>
#include <getopt.h>
#include <errno.h>
+#include <locale.h>
#include <assert.h>
#include <assert.h>
+#include <libintl.h>
#include "progname.h"
#include "xvasprintf.h"
#include "progname.h"
#include "xvasprintf.h"
@@
-36,6
+39,7
@@
guestfs_h *g;
int read_only = 0;
guestfs_h *g;
int read_only = 0;
+int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
@@
-74,6
+78,7
@@
usage (int status)
" --selinux Enable SELinux\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
" --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,
" -x Trace libguestfs API calls\n"
"For more information, see the manpage %s(1).\n"),
program_name, program_name, program_name,
@@
-92,6
+97,8
@@
main (int argc, char *argv[])
bindtextdomain (PACKAGE, LOCALEBASEDIR);
textdomain (PACKAGE);
bindtextdomain (PACKAGE, LOCALEBASEDIR);
textdomain (PACKAGE);
+ parse_config ();
+
enum { HELP_OPTION = CHAR_MAX + 1 };
static const char *options = "a:c:d:m:rvVx";
enum { HELP_OPTION = CHAR_MAX + 1 };
static const char *options = "a:c:d:m:rvVx";
@@
-105,6
+112,7
@@
main (int argc, char *argv[])
{ "memsize", 1, 0, 'm' },
{ "network", 0, 0, 0 },
{ "ro", 0, 0, 'r' },
{ "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' },
{ "selinux", 0, 0, 0 },
{ "verbose", 0, 0, 'v' },
{ "version", 0, 0, 'V' },
@@
-112,7
+120,6
@@
main (int argc, char *argv[])
};
struct drv *drvs = NULL;
struct drv *drv;
};
struct drv *drvs = NULL;
struct drv *drv;
- char *p, *file = NULL;
const char *format = NULL;
int c;
int option_index;
const char *format = NULL;
int c;
int option_index;
@@
-188,6
+195,10
@@
main (int argc, char *argv[])
OPTION_V;
break;
OPTION_V;
break;
+ case 'w':
+ OPTION_w;
+ break;
+
case 'x':
OPTION_x;
break;
case 'x':
OPTION_x;
break;
@@
-240,6
+251,7
@@
main (int argc, char *argv[])
assert (inspector == 0);
assert (keys_from_stdin == 0);
assert (echo_keys == 0);
assert (inspector == 0);
assert (keys_from_stdin == 0);
assert (echo_keys == 0);
+ assert (live == 0);
/* Must be no extra arguments on the command line. */
if (optind != argc)
/* Must be no extra arguments on the command line. */
if (optind != argc)