finish: dont switch to non-boot, till u-boot supports ext4-csum/etc...

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
RobertCNelson · Sep 12, 2016 · 378056f · 378056f
1 parent e205e5c
commit 378056f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git 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
@@ -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}