From 4676084b682f53547eb947fcbdac39cf7ba93b02 Mon Sep 17 00:00:00 2001
From: nacho <nacho.nunez@aoifes.com>
Date: Wed, 26 Apr 2017 16:44:14 +0200
Subject: [PATCH] rewrite workaround to support both qemu-arm 2.8.0 and below.
 Still recommended to upgrade

---
 README.md  |  2 ++
 qemu-pi.sh | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 78b11ed..a77701b 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,6 @@ unzip raspbian_lite_latest.zip
 sudo ./qemu-pi.sh *-raspbian-jessie-lite.img
 ```
 
+Note that it is recommended to use `qemu-arm` not older than 2.8.0 (see code)
+
 See details on https://ownyourbits.com/2017/02/06/raspbian-on-qemu-with-network-access/
diff --git a/qemu-pi.sh b/qemu-pi.sh
index 3ffdf32..9fcc028 100755
--- a/qemu-pi.sh
+++ b/qemu-pi.sh
@@ -115,11 +115,16 @@ KERNEL=="sda", SYMLINK+="mmcblk0"
 KERNEL=="sda?", SYMLINK+="mmcblk0p%n"
 KERNEL=="sda2", SYMLINK+="root"
 EOF
-# Fix a well documented issue - the kernel panics as init exits;
+
+# Work around a known issue with qemu-arm, versatile board and raspbian for at least qemu-arm < 2.8.0
+# This works but modifies the image so it is recommended to upgrade QEMU
 # Ref: http://stackoverflow.com/questions/38837606/emulate-raspberry-pi-raspbian-with-qemu
-cat > tmpmnt/etc/ld.so.preload <<EOF
-#/usr/lib/arm-linux-gnueabihf/libarmmem.so
-EOF
+
+QEMU_MAJOR=$( qemu-system-arm --version | head -1 | grep -oP '\d+.\d+.\d+' | cut -d. -f1 )
+QEMU_MINOR=$( qemu-system-arm --version | head -1 | grep -oP '\d+.\d+.\d+' | cut -d. -f2 )
+
+if [[ $QEMU_MAJOR == 2 ]] && [[ $QEMU_MINOR < 8 ]]; then sed -i '/^[^#].*libarmmem.so/s/^\(.*\)$/#\1/' tmpmnt/etc/ld.so.preload; fi
+if [[ $QEMU_MAJOR <  2 ]]                         ; then sed -i '/^[^#].*libarmmem.so/s/^\(.*\)$/#\1/' tmpmnt/etc/ld.so.preload; fi
 
 umount -l tmpmnt
 rmdir tmpmnt &>/dev/null