mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

RHEL: Reject use of libguestfs-winsupport features except for virt-* tools (RHBZ#1240276).

Browse Source 
Fix the tests: it doesn't let us use guestfish for arbitrary Windows
edits.
This commit is contained in:
Richard W.M. Jones
2015-07-07 09:28:03 -04:00
parent 010cd5ff44
commit d59942a7a3
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
generator/c.ml
View File

@@ -1846,6 +1846,22 @@ and generate_client_actions actions () =
check_args_validity c_name style; check_args_validity c_name style;
trace_call name c_name style; trace_call name c_name style;
(* RHEL 8 *)
if name = "mount" || name = "mount_ro" || name = "mount_options" ||
name = "mount_vfs" then (
pr " if (g->program && !STRPREFIX (g->program, \"virt-\")) {\n";
pr " CLEANUP_FREE char *vfs_type = guestfs_vfs_type (g, mountable);\n";
pr " if (vfs_type && STREQ (vfs_type, \"ntfs\")) {\n";
pr " error (g, \"mount: unsupported filesystem type\");\n";
pr " if (trace_flag)\n";
pr " guestfs_int_trace (g, \"%%s = %%s (error)\",\n";
pr " \"%s\", \"-1\");\n" name;
pr " return %s;\n" (string_of_errcode errcode);
pr " }\n";
pr " }\n";
pr "\n";
);
(* Calculate the total size of all FileIn arguments to pass (* Calculate the total size of all FileIn arguments to pass
* as a progress bar hint. * as a progress bar hint.
*) *)

1
test-data/phony-guests/make-windows-img.sh
View File

@@ -37,6 +37,7 @@ fi
# Create a disk image. # Create a disk image.
guestfish <<EOF guestfish <<EOF
set-program virt-testing
sparse windows.img-t 512M sparse windows.img-t 512M
run run

2
tests/charsets/test-charset-fidelity.c
View File

@@ -96,6 +96,8 @@ main (int argc, char *argv[])
if (g == NULL) if (g == NULL)
error (EXIT_FAILURE, 0, "failed to create handle"); error (EXIT_FAILURE, 0, "failed to create handle");
guestfs_set_program (g, "virt-testing");
if (guestfs_add_drive_scratch (g, 1024*1024*1024, -1) == -1) if (guestfs_add_drive_scratch (g, 1024*1024*1024, -1) == -1)
exit (EXIT_FAILURE); exit (EXIT_FAILURE);