cleanup: rename boot scripts, and tweak final run script

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

mk_mmc.sh

@@ -847,12 +847,12 @@ if [ "${USE_UENV}" ] ; then
  echo "Net Install Boot Script:"
  cp -v ${TEMPDIR}/bootscripts/netinstall.cmd ${TEMPDIR}/disk/uEnv.txt
  echo "-----------------------------"
- cat  ${TEMPDIR}/disk/uEnv.txt
+ cat  ${TEMPDIR}/bootscripts/netinstall.cmd
  echo "-----------------------------"
  echo "Normal Boot Script:"
- cp -v ${TEMPDIR}/bootscripts/normal.cmd ${TEMPDIR}/disk/boot.txt
+ cp -v ${TEMPDIR}/bootscripts/normal.cmd ${TEMPDIR}/disk/normal.txt
  echo "-----------------------------"
- cat  ${TEMPDIR}/disk/boot.txt
+ cat  ${TEMPDIR}/bootscripts/normal.cmd
  echo "-----------------------------"
 else
  echo "Copying boot.scr based boot scripts to Boot Partition"
@@ -866,7 +866,7 @@ else
  echo "-----------------------------"
  echo "Normal Boot Script:"
  cp -v ${TEMPDIR}/bootscripts/boot.cmd ${TEMPDIR}/disk/boot.cmd
- mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${TEMPDIR}/bootscripts/boot.cmd ${TEMPDIR}/disk/user.scr
+ mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${TEMPDIR}/bootscripts/boot.cmd ${TEMPDIR}/disk/normal.scr
  cat ${TEMPDIR}/bootscripts/boot.cmd
  echo "-----------------------------"
 fi

scripts/debian-tweaks.diff

@@ -3,7 +3,7 @@ new file mode 100755
 index 0000000..6d06fc7
 --- /dev/null
 +++ b/usr/lib/finish-install.d/08rcn-omap
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,47 @@
 +#!/bin/sh -e
 +cp /etc/e2fsck.conf /target/etc/e2fsck.conf
 +
@@ -12,15 +12,17 @@ index 0000000..6d06fc7
 +	mount /dev/mmcblk0p1 /tmp/mmc
 +
 +	#Remove NetInstall bits
-+	rm -f /tmp/mmc/boot.scr || true
 +	rm -f  /tmp/mmc/uInitrd.net || true
 +
 +	#Install kernel image deb
 +	LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/
 +	rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true
 +
-+	#Use the final boot files
++ #Setup Final Boot Scripts
-+	mv /tmp/mmc/user.scr /tmp/mmc/boot.scr
++ if [ -e "/tmp/mmc/boot.scr" ]; then
++  rm -f /tmp/mmc/boot.scr || true
++  mv /tmp/mmc/normal.scr /tmp/mmc/boot.scr
++ fi
 +
 +	mkdir -p /target/boot/uboot
 +	echo "/dev/mmcblk0p1   /boot/uboot auto   defaults            0   0" >> /target/etc/fstab

scripts/ubuntu-tweaks.diff

@@ -3,7 +3,7 @@ new file mode 100755
 index 0000000..6d06fc7
 --- /dev/null
 +++ b/usr/lib/finish-install.d/08rcn-omap
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,67 @@
 +#!/bin/sh -e
 +cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
 +cp /etc/SERIAL.conf /target/etc/init/SERIAL.conf
@@ -13,7 +13,6 @@ index 0000000..6d06fc7
 +	mount /dev/mmcblk0p1 /tmp/mmc
 +
 +	#Remove NetInstall bits
-+	rm -f /tmp/mmc/boot.scr || true
 +	rm -f  /tmp/mmc/uInitrd.net || true
 +
 +	#Cleanup Ubuntu's mess
@@ -44,8 +43,11 @@ index 0000000..6d06fc7
 +
 + chroot /target apt-get remove -y flash-kernel || true
 +
-+	#Use the final boot files
++ #Setup Final Boot Scripts
-+	mv /tmp/mmc/user.scr /tmp/mmc/boot.scr
++ if [ -e "/tmp/mmc/boot.scr" ]; then
++  rm -f /tmp/mmc/boot.scr || true
++  mv /tmp/mmc/normal.scr /tmp/mmc/boot.scr
++ fi
 +
 +	mkdir -p /target/boot/uboot
 +	echo "/dev/mmcblk0p1   /boot/uboot auto   defaults            0   0" >> /target/etc/fstab