From aff002cdb84280f0d583e6d357024d22caf898a6 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 26 May 2014 18:31:03 -0500 Subject: [PATCH] xml.c: Export and nodes correctly The XML data still needs to be handled better in general, but this fixes the bug that this information was missing from clone_image_info(). --- NEWS | 2 ++ src/xml.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/NEWS b/NEWS index 6e6704c1..b3e0d4d3 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,8 @@ Version 1.7.0-BETA: The 'mkwinpeimg' script now supports writing the ISO image to standard output. + The element in WIM XML data will now be exported correctly. + On Windows, sparse file attributes are no longer set on extracted files. On UNIX, configuring with --disable-xattr or --enable-xattr is no longer diff --git a/src/xml.c b/src/xml.c index 6233462c..d0975d95 100644 --- a/src/xml.c +++ b/src/xml.c @@ -90,6 +90,9 @@ struct image_info { tchar *display_description; tchar *flags; bool wimboot; + + /* Note: must update clone_image_info() if adding new fields here */ + struct wim_lookup_table *lookup_table; /* temporary field */ }; @@ -1001,6 +1004,8 @@ clone_windows_info(const struct windows_info *old, struct windows_info *new) { int ret; + new->arch = old->arch; + ret = dup_strings_from_specs(old, new, windows_info_xml_string_specs, ARRAY_LEN(windows_info_xml_string_specs)); if (ret) @@ -1063,6 +1068,7 @@ clone_image_info(const struct image_info *old, struct image_info *new) if (ret) return ret; } + new->wimboot = old->wimboot; return 0; } -- 2.43.0