From 378056fe75ff330792790e46ceef86849d49302e Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 12 Sep 2016 15:53:38 -0500
Subject: [PATCH] finish: dont switch to non-boot, till u-boot supports
 ext4-csum/etc...

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 lib/debian-finish.sh | 13 +++++++------
 lib/ubuntu-finish.sh | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh
index 56c71d6..a5726f0 100644
--- a/lib/debian-finish.sh
+++ b/lib/debian-finish.sh
@@ -88,16 +88,17 @@ mv /boot/uboot/mounts /boot/uboot/backup/ || true
 wfile="/boot/uEnv.txt"
 
 if [ "x${conf_smart_uboot}" = "xenable" ] ; then
-	rootdrive=$(echo ${FINAL_PART} | awk -F"p" '{print $1}' || true)
-	if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
-		rm -f /boot/uboot/boot/uEnv.txt || true
-		echo "uname_r=$(uname -r)" > ${wfile}
-	else
+###FIXME: U-BOOT: Unsupported feature found (64bit, possibly metadata_csum), not mounting
+#	rootdrive=$(echo ${FINAL_PART} | awk -F"p" '{print $1}' || true)
+#	if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
+#		rm -f /boot/uboot/boot/uEnv.txt || true
+#		echo "uname_r=$(uname -r)" > ${wfile}
+#	else
 		wfile="/boot/uboot/boot/uEnv.txt"
 		echo "uname_r=current" > ${wfile}
 		cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current
 		cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current
-	fi
+#	fi
 else
 	wfile="/boot/uboot/boot/uEnv.txt"
 	echo "uname_r=current" > ${wfile}
diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh
index 8e39574..a2cdc7c 100644
--- a/lib/ubuntu-finish.sh
+++ b/lib/ubuntu-finish.sh
@@ -78,16 +78,17 @@ mv /boot/uboot/mounts /boot/uboot/backup/ || true
 wfile="/boot/uEnv.txt"
 
 if [ "x${conf_smart_uboot}" = "xenable" ] ; then
-	rootdrive=$(echo ${FINAL_PART} | awk -F"p" '{print $1}' || true)
-	if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
-		rm -f /boot/uboot/boot/uEnv.txt || true
-		echo "uname_r=$(uname -r)" > ${wfile}
-	else
+###FIXME: U-BOOT: Unsupported feature found (64bit, possibly metadata_csum), not mounting
+#	rootdrive=$(echo ${FINAL_PART} | awk -F"p" '{print $1}' || true)
+#	if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
+#		rm -f /boot/uboot/boot/uEnv.txt || true
+#		echo "uname_r=$(uname -r)" > ${wfile}
+#	else
 		wfile="/boot/uboot/boot/uEnv.txt"
 		echo "uname_r=current" > ${wfile}
 		cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current
 		cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current
-	fi
+#	fi
 else
 	wfile="/boot/uboot/boot/uEnv.txt"
 	echo "uname_r=current" > ${wfile}