git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
appliance: Add 'attr' package for xattr support in virt-rescue.
[libguestfs.git]
/
fish
/
inspect.c
diff --git
a/fish/inspect.c
b/fish/inspect.c
index
2817112
..
28c1b88
100644
(file)
--- a/
fish/inspect.c
+++ b/
fish/inspect.c
@@
-28,8
+28,6
@@
#include "options.h"
#include "options.h"
-static void do_decrypt (void);
-
/* Global that saves the root device between inspect_mount and
* print_inspect_prompt.
*/
/* Global that saves the root device between inspect_mount and
* print_inspect_prompt.
*/
@@
-75,7
+73,7
@@
compare_keys (const void *p1, const void *p2)
void
inspect_mount (void)
{
void
inspect_mount (void)
{
- do_decrypt ();
+
inspect_
do_decrypt ();
char **roots = guestfs_inspect_os (g);
if (roots == NULL)
char **roots = guestfs_inspect_os (g);
if (roots == NULL)
@@
-96,6
+94,12
@@
inspect_mount (void)
root = roots[0];
free (roots);
root = roots[0];
free (roots);
+ inspect_mount_root (root);
+}
+
+void
+inspect_mount_root (const char *root)
+{
char **mountpoints = guestfs_inspect_get_mountpoints (g, root);
if (mountpoints == NULL)
exit (EXIT_FAILURE);
char **mountpoints = guestfs_inspect_get_mountpoints (g, root);
if (mountpoints == NULL)
exit (EXIT_FAILURE);
@@
-178,8
+182,8
@@
make_mapname (const char *device, char *mapname, size_t len)
* for Fedora whole-disk encryption. WIP to make this work for other
* encryption schemes.
*/
* for Fedora whole-disk encryption. WIP to make this work for other
* encryption schemes.
*/
-
static
void
-do_decrypt (void)
+void
+
inspect_
do_decrypt (void)
{
char **partitions = guestfs_list_partitions (g);
if (partitions == NULL)
{
char **partitions = guestfs_list_partitions (g);
if (partitions == NULL)