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

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/62/head
Robert Nelson 8 years ago
parent e205e5c324
commit 378056fe75

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

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

Loading…
Cancel
Save