X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=1c077b7f2fae1afb1db12fc53cf0c99b8894c4a1;hb=5d0f0ceca613ee64592512290ab36140e053942b;hp=79fe2b8fdcee9d7ab1154938e691a8232575a60e;hpb=933e1e95ffed656c1adb46b3e3c2fda524ef552b;p=wimlib

diff --git a/programs/imagex.c b/programs/imagex.c
index 79fe2b8f..1c077b7f 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -46,6 +46,8 @@
 #  include <alloca.h>
 #endif
 
+#define WIMLIB_COMPRESSION_TYPE_INVALID (-1)
+
 #ifdef __WIN32__
 #  include "imagex-win32.h"
 #  define print_security_descriptor     win32_print_security_descriptor
@@ -269,6 +271,7 @@ static const struct option export_options[] = {
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
+	{T("recompress"),  no_argument,       NULL, IMAGEX_RECOMPRESS_OPTION},
 	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
 	{T("pack-streams"),no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},
 	{T("solid"),       no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},
@@ -1078,24 +1081,13 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 			imagex_printf(T("\nWARNING: Excluding unsupported file or directory\n"
 					"         \"%"TS"\" from capture\n"), info->scan.cur_path);
 			break;
-		case WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK:
-			imagex_printf(T("\nWARNING: Ignoring absolute symbolic link "
-					"with out-of-tree target:\n"
-					"           \"%"TS"\" => \"%"TS"\"\n"
-					"           (Use --norpfix to capture "
-					"absolute symbolic links as-is)\n"),
-				        info->scan.cur_path, info->scan.symlink_target);
-			break;
 		case WIMLIB_SCAN_DENTRY_FIXED_SYMLINK:
 			/* Symlink fixups are enabled by default.  This is
 			 * mainly intended for Windows, which for some reason
 			 * uses absolute junctions (with drive letters!) in the
 			 * default installation.  On UNIX-like systems, warn the
 			 * user when fixing the target of an absolute symbolic
-			 * link, so they know to disable this if they want.
-			 * (Although, more likely they will get the warning
-			 * about an absolute symbolic link with an out-of-tree
-			 * target first.)  */
+			 * link, so they know to disable this if they want.  */
 		#ifndef __WIN32__
 			imagex_printf(T("\nWARNING: Adjusted target of "
 					"absolute symbolic link \"%"TS"\"\n"
@@ -1104,6 +1096,8 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 				        info->scan.cur_path);
 		#endif
 			break;
+		default:
+			break;
 		}
 		break;
 	case WIMLIB_PROGRESS_MSG_SCAN_END:
@@ -2619,6 +2613,9 @@ imagex_export(int argc, tchar **argv, int cmd)
 			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
 				goto out_err;
 			break;
+		case IMAGEX_RECOMPRESS_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			break;
 		case IMAGEX_COMPRESS_SLOW_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
 			set_compress_slow();
@@ -4039,6 +4036,7 @@ T(
 "                    DEST_WIMFILE [DEST_IMAGE_NAME [DEST_IMAGE_DESCRIPTION]]\n"
 "                    [--boot] [--check] [--nocheck] [--compress=TYPE]\n"
 "                    [--ref=\"GLOB\"] [--threads=NUM_THREADS] [--rebuild]\n"
+"                    [--wimboot]\n"
 ),
 [CMD_EXTRACT] =
 T(