diff options
| -rwxr-xr-x | scripts/image_signing/make_dev_ssd.sh | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh index d9df52a5..7c6f68e6 100755 --- a/scripts/image_signing/make_dev_ssd.sh +++ b/scripts/image_signing/make_dev_ssd.sh @@ -491,6 +491,20 @@ validity_check_live_firmware() { return $FLAGS_FALSE } +validity_check() { + validity_check_live_partitions || return $FLAGS_FALSE + + # Remaining checks depend on firmware; skip if device is running in a VM. + if crossystem 'inside_vm?1'; then + debug_msg "Device is a VM, skipping firmware checks" + return $FLAGS_TRUE + fi + + validity_check_live_firmware || return $FLAGS_FALSE + validity_check_crossystem_flags || return $FLAGS_FALSE + return $FLAGS_TRUE +} + # Main # ---------------------------------------------------------------------------- main() { @@ -536,9 +550,7 @@ main() { sleep 1 done echo "" - elif ! validity_check_live_firmware || - ! validity_check_live_partitions || - ! validity_check_crossystem_flags; then + elif ! validity_check; then die "IMAGE ${FLAGS_image} IS NOT MODIFIED." fi fi |