  src/install.c        |  2 +-
  src/main.c           | 27 ++++++++-------
  src/update_handler.c |  2 +-
- 5 files changed, 64 insertions(+), 47 deletions(-)
+ 5 files changed, 63 insertions(+), 48 deletions(-)
 
 diff --git a/include/context.h b/include/context.h
-index b0bcfba64855806b14bc7a7e1108d7342c124463..ba54e81eaefe34a7f5b26c9571d770bd2dc2f15a 100644
+index 48bbda3..ec9c6a2 100644
 --- a/include/context.h
 +++ b/include/context.h
-@@ -43,6 +43,8 @@ typedef struct {
+@@ -45,6 +45,8 @@ typedef struct {
+
+ 	/* optional custom handler extra arguments */
  	gchar *handlerextra;
- 	/* ignore compatible check */
- 	gboolean ignore_compatible;
 +	/* skip bundle verification */
 +	gboolean bundle_nosig;
- 
+
  	/* for storing installation runtime informations */
  	RContextInstallationInfo *install_info;
 diff --git a/src/bundle.c b/src/bundle.c
-index 9ca512c0ef2512a9e011f638edba762c4f2ff87b..864e8bad283699d039f9b60762283aadc11875d4 100644
+index 1a9bd39..96e7f13 100644
 --- a/src/bundle.c
 +++ b/src/bundle.c
-@@ -318,6 +318,8 @@ static gboolean input_stream_read_bytes_all(GInputStream *stream,
+@@ -364,6 +364,8 @@ static gboolean input_stream_read_bytes_all(GInputStream *stream,
  	return TRUE;
  }
- 
+
 +/* Appends signature to specified bundle file.
 + * Signature format: N bytes followed by uint64(N) */
  static gboolean sign_bundle(const gchar *bundlename, GError **error)
  {
  	GError *ierror = NULL;
-@@ -326,22 +328,7 @@ static gboolean sign_bundle(const gchar *bundlename, GError **error)
+@@ -372,22 +374,7 @@ static gboolean sign_bundle(const gchar *bundlename, GError **error)
  	g_autoptr(GFileOutputStream) bundlestream = NULL;
  	guint64 offset;
- 
+
 -	g_assert_nonnull(r_context()->certpath);
 -	g_assert_nonnull(r_context()->keypath);
 -

From 29f2eeb0d7744840f668dc616f349a9bfbad073b Mon Sep 17 00:00:00 2001
From: Bill Pittman <bill.pittman@ni.com>
Date: Fri, 28 Jun 2019 12:37:23 -0500
Subject: [PATCH] rauc: Add command line option to skip bundle verification

+			goto out;
+		}
 	}

 	inpath = resolve_path(NULL, argv[2]);
@@ -493,7 +496,7 @@ static gboolean resign_start(int argc, char **argv)
 		goto out;
 	}

-	if (!check_bundle(argv[2], &bundle, !verification_disabled, &ierror)) {
+	if (!check_bundle(argv[2], &bundle, !bundle_nosig, &ierror)) {
 		g_printerr("%s\n", ierror->message);
 		g_clear_error(&ierror);
 		r_exit_status = 1;
@@ -538,7 +541,7 @@ static gboolean extract_start(int argc, char **argv)
 	g_debug("input bundle: %s", argv[2]);
 	g_debug("output dir: %s", argv[3]);

-	if (!check_bundle(argv[2], &bundle, TRUE, &ierror)) {
+	if (!check_bundle(argv[2], &bundle, !bundle_nosig, &ierror)) {
 		g_printerr("%s\n", ierror->message);
 		g_clear_error(&ierror);
 		r_exit_status = 1;
@@ -591,7 +594,7 @@ static gboolean convert_start(int argc, char **argv)
 	g_debug("input bundle: %s", argv[2]);
 	g_debug("output bundle: %s", argv[3]);

-	if (!check_bundle(argv[2], &bundle, TRUE, &ierror)) {
+	if (!check_bundle(argv[2], &bundle, !bundle_nosig, &ierror)) {
 		g_printerr("%s\n", ierror->message);
 		g_clear_error(&ierror);
 		r_exit_status = 1;
@@ -908,7 +911,7 @@ static gboolean info_start(int argc, char **argv)
 		goto out;
 	g_debug("input bundle: %s", bundlelocation);

-	res = check_bundle(bundlelocation, &bundle, !verification_disabled, &error);
+	res = check_bundle(bundlelocation, &bundle, !bundle_nosig, &error);
 	if (!res) {
 		g_printerr("%s\n", error->message);
 		g_clear_error(&error);
@@ -1715,7 +1718,6 @@ static GOptionEntry entries_bundle[] = {
 };

 static GOptionEntry entries_resign[] = {
-	{"no-verify", '\0', 0, G_OPTION_ARG_NONE, &verification_disabled, "disable bundle verification", NULL},
 	{"signing-keyring", '\0', 0, G_OPTION_ARG_FILENAME, &signing_keyring, "verification keyring file", "PEMFILE"},
 	{0}
 };
@@ -1728,7 +1730,6 @@ static GOptionEntry entries_convert[] = {
 };

 static GOptionEntry entries_info[] = {
-	{"no-verify", '\0', 0, G_OPTION_ARG_NONE, &verification_disabled, "disable bundle verification", NULL},
 	{"output-format", '\0', 0, G_OPTION_ARG_STRING, &output_format, "output format", "FORMAT"},
 	{"dump-cert", '\0', 0, G_OPTION_ARG_NONE, &info_dumpcert, "dump certificate", NULL},
 	{0}
@@ -1786,6 +1787,7 @@ static void cmdline_handler(int argc, char **argv)
 		{"mount", '\0', 0, G_OPTION_ARG_FILENAME, &mount, "mount prefix", "PATH"},
 		{"override-boot-slot", '\0', 0, G_OPTION_ARG_STRING, &bootslot, "override auto-detection of booted slot", "BOOTNAME"},
 		{"handler-args", '\0', 0, G_OPTION_ARG_STRING, &handlerextra, "extra handler arguments", "ARGS"},
