From 41fd49ad18b3af3fcd32fb8e64e5ec8763689bcb Mon Sep 17 00:00:00 2001
From: "Lukas F. Hartmann" <lukas@mntre.com>
Date: Fri, 26 Feb 2021 16:27:12 +0100
Subject: [PATCH] skel: fixes to reform-display-config and reform-boot-config
---
reform2-imx8mq/template-skel/bin/reform-boot-config | 9 ++++-----
reform2-imx8mq/template-skel/bin/reform-display-config | 10 +++++-----
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/reform2-imx8mq/template-skel/bin/reform-boot-config b/reform2-imx8mq/template-skel/bin/reform-boot-config
index 863904d..a78c00e 100755
--- a/reform2-imx8mq/template-skel/bin/reform-boot-config
+++ b/reform2-imx8mq/template-skel/bin/reform-boot-config
@@ -25,12 +25,12 @@ then
exit
fi
-MOUNTED_AT=$(mount | grep mmblk1p1 | cut -d ' ' -s -f 3)
-if [ $? -eq 0 ]
+MOUNTED_AT=$(mount | grep mmcblk1p1 | grep "on /" | cut -d ' ' -s -f 3)
+if [[ "x$MOUNTED_AT" != "x" ]]
then
echo "Found SD card mounted at $MOUNTED_AT."
- echo "$BOOTPREF" > "$MOUNTED_AT/reform-boot-medium"
- echo "Boot medium choice $BOOTPREF recorded in $MOUNTED_AT/reform-boot-medium."
+ echo "$BOOTPREF" > "${MOUNTED_AT}/reform-boot-medium"
+ echo "Boot medium choice $BOOTPREF recorded in ${MOUNTED_AT}/reform-boot-medium."
echo "Restart MNT Reform (type: reboot) after saving your work to activate the changes."
exit
fi
@@ -51,4 +51,3 @@ fi
echo "Error: could not mount the SD card."
umount /boot
-
diff --git a/reform2-imx8mq/template-skel/bin/reform-display-config b/reform2-imx8mq/template-skel/bin/reform-display-config
index dd2d8cd..7385c92 100755
--- a/reform2-imx8mq/template-skel/bin/reform-display-config
+++ b/reform2-imx8mq/template-skel/bin/reform-display-config
@@ -12,7 +12,7 @@ DTB_TARGET="imx8mq-mnt-reform2.dtb"
case "$1" in
dual) DTB="imx8mq-mnt-reform2-dual-display.dtb";;
- internal) DTB="imx8mq-mnt-reform2-single-display.dtb";;
+ single) DTB="imx8mq-mnt-reform2-single-display.dtb";;
esac
if [[ "$DTB" == "x" ]]
@@ -23,18 +23,19 @@ then
exit
fi
-MOUNTED_AT=$(mount | grep mmblk1p1 | cut -d ' ' -s -f 3)
+MOUNTED_AT=$(mount | grep mmcblk1p1 | grep "on /" | cut -d ' ' -s -f 3)
if [[ "x$MOUNTED_AT" != "x" ]]
then
- if [[ -e "$MOUNTED_AT$DTB_TARGET" ]] && [[ -e "$MOUNTED_AT$DTB" ]]
+ if [[ -e "${MOUNTED_AT}/${DTB_TARGET}" ]] && [[ -e "${MOUNTED_AT}/${DTB}" ]]
then
echo "Found source and target files in $MOUNTED_AT."
- cp -v "/$DTB" "/$DTB_TARGET"
+ cp -v "${MOUNTED_AT}/${DTB}" "${MOUNTED_AT}/${DTB_TARGET}"
echo "Restart MNT Reform (type: reboot) after saving your work to activate the changes."
exit
fi
echo "Error: the SD card is already mounted at $MOUNTED_AT, but the DTB files ($DTB_TARGET and $DTB) are not there."
+ exit
fi
echo "Assuming boot files are on SD card, but your system is not. Mounting /dev/mmcblk1p1 on /boot."
@@ -53,4 +54,3 @@ fi
echo "Error: could not find the DTB files ($DTB_TARGET and $DTB) in any of the expected places."
umount /boot
-
--
GitLab