xml_windows: support non-default system roots

[wimlib] / src / update_image.c

diff --git a/src/update_image.c b/src/update_image.c
index 15458a12b51593984d00637d701abad8d13fe377..85de4249f3435206c3fb46de9e3beff2a12fa490 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -64,6 +64,7 @@
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
 #include "wimlib/progress.h"
+#include "wimlib/xml_windows.h"
 
 /* Saved specification of a "primitive" update operation that was performed.  */
 struct update_primitive {
@@ -869,6 +870,12 @@ execute_add_command(struct update_command_journal *j,
                        goto out_destroy_config;
        }
 
+       if (WIMLIB_IS_WIM_ROOT_PATH(wim_target_path)) {
+               ret = set_windows_specific_info(wim);
+               if (ret)
+                       goto out_destroy_config;
+       }
+
        ret = 0;
 out_destroy_config:
        destroy_capture_config(&config);
@@ -1197,7 +1204,8 @@ check_add_command(struct wimlib_update_command *cmd,
                          WIMLIB_ADD_FLAG_WINCONFIG |
                          WIMLIB_ADD_FLAG_WIMBOOT |
                          WIMLIB_ADD_FLAG_NO_REPLACE |
-                         WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION))
+                         WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION |
+                         WIMLIB_ADD_FLAG_SNAPSHOT))
                return WIMLIB_ERR_INVALID_PARAM;
 
        bool is_entire_image = WIMLIB_IS_WIM_ROOT_PATH(cmd->add.wim_target_path);
@@ -1211,7 +1219,7 @@ check_add_command(struct wimlib_update_command *cmd,
 #endif
 
 #ifdef __WIN32__
-       /* Check for flags not supported on Windows */
+       /* Check for flags not supported on Windows.  */
        if (add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
                ERROR("Capturing UNIX-specific data is not supported on Windows");
                return WIMLIB_ERR_UNSUPPORTED;
@@ -1220,6 +1228,15 @@ check_add_command(struct wimlib_update_command *cmd,
                ERROR("Dereferencing symbolic links is not supported on Windows");
                return WIMLIB_ERR_UNSUPPORTED;
        }
+#else
+       /* Check for flags only supported on Windows.  */
+
+       /* Currently, SNAPSHOT means Windows VSS.  In the future, it perhaps
+        * could be implemented for other types of snapshots, such as btrfs.  */
+       if (add_flags & WIMLIB_ADD_FLAG_SNAPSHOT) {
+               ERROR("Snapshot mode is only supported on Windows (VSS)");
+               return WIMLIB_ERR_UNSUPPORTED;
+       }
 #endif
 
        /* VERBOSE implies EXCLUDE_VERBOSE */