ONIE Installer debug flag -j

This provides the option of disabling checksums and printing out script execution to debug installer issues. -j was chosen as it does not and is not likely to conflict with existing or future arguments. Signed-off-by: Alex Doyle <[email protected]>
opencomputeproject · Oct 16, 2021 · 905482c · 905482c
1 parent d9f6aa3
commit 905482c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/installer/grub-arch/install-arch b/installer/grub-arch/install-arch
@@ -31,6 +31,8 @@ args_arch="d:"
 usage_arch=$(cat <<EOF
 	-d
 		Target ONIE install device.  Must be a valid block device.
+	-j
+		Debug installer.
 EOF
 )
 
@@ -44,6 +46,9 @@ parse_arg_arch()
         d)
             onie_dev="$optarg"
             ;;
+		j)
+			set -x
+			;;
         *)
             return 1
             ;;

diff --git a/installer/install.sh b/installer/install.sh
@@ -49,7 +49,7 @@ true ${onie_config_version=0}
 # assign the value from onie_machine.
 onie_build_machine=${onie_build_machine:-$onie_machine}
 
-args="hivfqx${args_arch}"
+args="hivfqxj${args_arch}"
 
 usage()
 {
@@ -76,6 +76,8 @@ COMMAND LINE OPTIONS
 	-f
 		Force ONIE update opteration, bypassing any safety
 		checks.
+	-j
+		Debug.
 
 $usage_arch
 EOF
@@ -107,6 +109,10 @@ while getopts "$args" a ; do
             cat ./machine-build.conf
             exit 0
             ;;
+        j)
+            set -x
+            ;;
+
         *)
             parse_arg_arch "$a" "$OPTARG" || {
                 echo "Unknown argument: $a"

diff --git a/installer/sharch_body.sh b/installer/sharch_body.sh
@@ -16,12 +16,17 @@
 
 extract=no
 quiet=no
-args=":xq"
+do_debug=no
+args=":xqj"
 while getopts "$args" a ; do
     case $a in
         x)
             extract=yes
             ;;
+        j)
+            set -x
+            do_debug="yes"
+            ;;
         q)
             quiet=yes
             ;;
@@ -40,7 +45,9 @@ if [ "$sha1" != "$payload_sha1" ] ; then
     echo "ERROR: Unable to verify archive checksum"
     echo "Expected: $payload_sha1"
     echo "Found   : $sha1"
-    exit 1
+    if [ "$do_debug" = "no" ];then
+        exit 1
+    fi
 fi
 
 [ "$quiet" = "no" ] && echo " OK."