imagex capture/append: --verbose implies verbose write

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index fc89cdfe036aec38146f5dee6464b1d3f54a82d8..f79a07caafa8b6ff0278c9243386a3b3557390e1 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -516,6 +516,7 @@ static int imagex_capture_or_append(int argc, const char **argv)
                        break;
                case 'v':
                        add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+                       write_flags |= WIMLIB_WRITE_FLAG_VERBOSE;
                        break;
                default:
                        usage(cmd);
@@ -735,7 +736,7 @@ static int imagex_export(int argc, const char **argv)
        int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
        int export_flags = 0;
        int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS;
-       int compression_type = WIM_COMPRESSION_TYPE_XPRESS;
+       int compression_type;
        bool compression_type_specified = false;
        const char *src_wimfile;
        const char *src_image_num_or_name;
@@ -818,6 +819,8 @@ static int imagex_export(int argc, const char **argv)
        } else {
                wim_is_new = true;
                /* dest_wimfile is not an existing file, so create a new WIM. */
+               if (!compression_type_specified)
+                       compression_type = wimlib_get_compression_type(src_w);
                if (errno == ENOENT) {
                        ret = wimlib_create_new_wim(compression_type, &dest_w);
                        if (ret != 0)
@@ -1452,10 +1455,3 @@ int main(int argc, const char **argv)
        usage_all();
        return 1;
 }
-/*#ifndef WITH_NTFS_3G*/
-               /*ERROR("wimlib was not compiled with support for NTFS-3g, so we cannot extract");*/
-               /*ERROR("a WIM to a NTFS filesystem while preserving NTFS-specific metadata.");*/
-               /*ERROR("Please apply the WIM to a directory rather than a block device, ");*/
-               /*ERROR("and without the NTFS flag; or compile in support for NTFS-3g.");*/
-               /*return WIMLIB_ERR_UNSUPPORTED;*/
-/*#endif*/