commit e201e2b9f46a9edd9eca52fb79649b1475bf7579
author Hoa Nguyen <hoanguyen@ucdavis.edu> Tue Mar 29 15:26:38 2022 -0700
committer Hoa Nguyen <hoanguyen@ucdavis.edu> Fri Aug 19 02:52:10 2022 +0000
tree 46c7a76459884aac3c0ad8c4cc415f0bd5710f78
parent 0151c340e58d3d01cf3da025aaa8b61435c9a6e2

resources: Allow failed m5 to fall back to bash instead of sh

Signed-off-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
Change-Id: Ie1da32afd54c7043b612d0c8ca2fba583f4445fb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/58330
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>

src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh

diff --git a/src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh b/src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh
index bbdbbfb..482f019 100755
--- a/src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh
+++ b/src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh
@@ -1,22 +1,25 @@
 #!/bin/bash
 
+# Copyright (c) 2022 The University of California.
 # Copyright (c) 2021 The University of Texas at Austin.
 # SPDX-License-Identifier: BSD 3-Clause
 
-echo "Starting gem5 init... reading run script file."
-if ! m5 readfile > /tmp/script; then
-    echo "Failed to run m5 readfile, exiting!"
-    rm -f /tmp/script
-    if ! m5 exit; then
-        # Useful for booting the disk image in (e.g.,) qemu for debugging
-        echo "m5 exit failed, dropping to shell."
-        /bin/sh
+if ! [ -z $IGNORE_M5 ]; then
+    echo "Starting gem5 init... reading run script file."
+    if ! m5 readfile > /tmp/script; then
+        echo "Failed to run m5 readfile, exiting!"
+        rm -f /tmp/script
+        if ! m5 exit; then
+            # Useful for booting the disk image in (e.g.,) qemu for debugging
+            echo "m5 exit failed, dropping to shell."
+            IGNORE_M5=1 /bin/bash
+        fi
+    else
+        echo "Running m5 script from /tmp/script"
+        chmod 755 /tmp/script
+        /tmp/script
+        echo "Done running script, exiting."
+        rm -f /tmp/script
+        m5 exit
     fi
-else
-    echo "Running m5 script from /tmp/script"
-    chmod 755 /tmp/script
-    /tmp/script
-    echo "Done running script, exiting."
-    rm -f /tmp/script
-    m5 exit
 fi

src/x86-ubuntu/disk-image/x86-ubuntu/gem5_init.sh

diff --git a/src/x86-ubuntu/disk-image/x86-ubuntu/gem5_init.sh b/src/x86-ubuntu/disk-image/x86-ubuntu/gem5_init.sh
index bbdbbfb..482f019 100755
--- a/src/x86-ubuntu/disk-image/x86-ubuntu/gem5_init.sh
+++ b/src/x86-ubuntu/disk-image/x86-ubuntu/gem5_init.sh
@@ -1,22 +1,25 @@
 #!/bin/bash
 
+# Copyright (c) 2022 The University of California.
 # Copyright (c) 2021 The University of Texas at Austin.
 # SPDX-License-Identifier: BSD 3-Clause
 
-echo "Starting gem5 init... reading run script file."
-if ! m5 readfile > /tmp/script; then
-    echo "Failed to run m5 readfile, exiting!"
-    rm -f /tmp/script
-    if ! m5 exit; then
-        # Useful for booting the disk image in (e.g.,) qemu for debugging
-        echo "m5 exit failed, dropping to shell."
-        /bin/sh
+if ! [ -z $IGNORE_M5 ]; then
+    echo "Starting gem5 init... reading run script file."
+    if ! m5 readfile > /tmp/script; then
+        echo "Failed to run m5 readfile, exiting!"
+        rm -f /tmp/script
+        if ! m5 exit; then
+            # Useful for booting the disk image in (e.g.,) qemu for debugging
+            echo "m5 exit failed, dropping to shell."
+            IGNORE_M5=1 /bin/bash
+        fi
+    else
+        echo "Running m5 script from /tmp/script"
+        chmod 755 /tmp/script
+        /tmp/script
+        echo "Done running script, exiting."
+        rm -f /tmp/script
+        m5 exit
     fi
-else
-    echo "Running m5 script from /tmp/script"
-    chmod 755 /tmp/script
-    /tmp/script
-    echo "Done running script, exiting."
-    rm -f /tmp/script
-    m5 exit
 fi