[ General ] Move bootscript update to nand-sata-install

kobol-io · Jan 20, 2019 · c386e19 · c386e19
1 parent 9116aa2
commit c386e19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh
@@ -214,17 +214,7 @@ create_board_package()
 			echo "Updating bootscript"
 
 			# copy new bootscript
-			cp /usr/share/armbian/$bootscript_dst /boot  >/dev/null 2>&1
-
-			# build new bootscript
-			if [ -f /boot/boot.cmd ]; then
-				mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr  >/dev/null 2>&1
-			elif [ -f /boot/boot.ini ]; then
-				rootdev=\$(sed -e 's/^.*root=//' -e 's/ .*\$//' < /proc/cmdline)
-				rootfstype=\$(sed -e 's/^.*rootfstype=//' -e 's/ .*$//' < /proc/cmdline)
-				sed -i "s/setenv rootfstype.*/setenv rootfstype \\"\$rootfstype\\"/" /boot/boot.ini
-				sed -i "s/setenv rootdev.*/setenv rootdev \\"\$rootdev\\"/" /boot/boot.ini
-			fi
+			cp -f /usr/share/armbian/$bootscript_dst /boot/${$bootscript_dst}.new  >/dev/null 2>&1
 
 			# cleanup old bootscript backup
 			[ -f /usr/share/armbian/boot.cmd ] && ls /usr/share/armbian/boot.cmd-* | head -n -5 | xargs rm -f --

diff --git a/packages/bsp/common/usr/sbin/nand-sata-install b/packages/bsp/common/usr/sbin/nand-sata-install
@@ -521,6 +521,21 @@ check_nvme_target()
 	DISK_ROOT_PART=${NVMeOptions[(2*$NVMeChoices)-1]}
 }
 
+# build and update new bootscript
+update_bootscript()
+{
+	if [ -f /boot/boot.cmd.new ]; then
+		mv -f /boot/boot.cmd.new /boot/boot.cmd >/dev/null 2>&1
+		mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr  >/dev/null 2>&1
+	elif [ -f /boot/boot.ini.new ]; then
+		mv -f /boot/boot.ini.new /boot/boot.ini >/dev/null 2>&1
+		rootdev=\$(sed -e 's/^.*root=//' -e 's/ .*\$//' < /proc/cmdline)
+		rootfstype=\$(sed -e 's/^.*rootfstype=//' -e 's/ .*$//' < /proc/cmdline)
+		sed -i "s/setenv rootfstype.*/setenv rootfstype \\"\$rootfstype\\"/" /boot/boot.ini
+		sed -i "s/setenv rootdev.*/setenv rootdev \\"\$rootdev\\"/" /boot/boot.ini
+	fi
+}
+
 # show warning [TEXT]
 show_warning()
 {
@@ -646,6 +661,7 @@ main()
 			5)
 				show_warning "This script will update the bootloader on SD/eMMC. Continue?"
 				write_uboot_platform $DIR ${root_partition_device}
+				update_bootscript
 				dialog --backtitle "$backtitle" --title "Writing bootloader" --msgbox "\n          Done." 7 30
 				return
 				;;
@@ -664,6 +680,7 @@ main()
 				MTD_BLK="/dev/${spicheck}"
 				show_warning "This script will update the bootloader on SPI Flash $MTD_BLK. Continue?"
 				write_uboot_platform_mtd $DIR $MTD_BLK
+				update_bootscript
 				echo "Done"
 				return
 				;;