diff --git a/packages/bsp/common/usr/sbin/nand-sata-install b/packages/bsp/common/usr/sbin/nand-sata-install index 063dbeda50..15c4487320 100755 --- a/packages/bsp/common/usr/sbin/nand-sata-install +++ b/packages/bsp/common/usr/sbin/nand-sata-install @@ -79,9 +79,9 @@ create_armbian() sync && mkdir -p ${TempDir}/bootfs ${TempDir}/rootfs if [[ $eMMCFilesystemChoosen =~ ^(btrfs|f2fs)$ ]]; then [[ -n $1 ]] && mount ${1::-1}"1" ${TempDir}/bootfs - [[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs || mount $2 ${TempDir}/rootfs ) + [[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs 2> /dev/null || mount $2 ${TempDir}/rootfs ) else - [[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs || mount $2 ${TempDir}/rootfs ) + [[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs 2> /dev/null || mount $2 ${TempDir}/rootfs ) [[ -n $1 && $1 != "spi" ]] && mount $1 ${TempDir}/bootfs fi rm -rf ${TempDir}/bootfs/* ${TempDir}/rootfs/* @@ -582,7 +582,7 @@ main() [[ -n $spicheck ]] && options+=(4 "Boot from SPI - system on SATA, USB or NVMe") # U-boot install/update options - [[ -n ${root_partition_device} ]] && options+=(5 "Install/Update the bootloader on SD") + [[ -n ${root_partition_device} ]] && options+=(5 "Install/Update the bootloader on SD/eMMC") [[ ( $LINUXFAMILY == odroidxu4 || $LINUXFAMILY == mvebu* || $LINUXFAMILY == mt7623 ) && ( -b /dev/mmcblk0boot0 || -b /dev/mmcblk1boot0 ) ]] && options+=(6 "Install/Update the bootloader on special eMMC partition") [[ -n $spicheck && $(type -t write_uboot_platform_mtd) == function ]] && options+=(7 "Install/Update the bootloader on SPI Flash") @@ -644,9 +644,9 @@ main() create_armbian "spi" "$DISK_ROOT_PART" ;; 5) - show_warning "This script will update the bootloader on SD. Continue?" + show_warning "This script will update the bootloader on SD/eMMC. Continue?" write_uboot_platform $DIR ${root_partition_device} - echo "Done" + dialog --backtitle "$backtitle" --title "Writing bootloader" --msgbox "\n Done." 7 30 return ;; 6)