From fe7e8754bbed86644fd76771dd188d4add8dddb9 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 3 Jan 2011 17:17:52 -0600
Subject: [PATCH] no more, user button mofications

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh                   |  8 ++++----
 scripts/squeeze-preseed.cfg |  6 ++++--
 scripts/squeeze-tweaks.diff | 14 +++++++-------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 28e992f..a902047 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -354,12 +354,12 @@ echo "uImage"
 sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage
 
 if [ "${SERIAL_MODE}" ] ; then
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/serial.cmd ${TEMPDIR}/disk/user.scr
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.scr
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/serial.cmd ${TEMPDIR}/disk/boot.scr
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
  sudo cp -v ${DIR}/scripts/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/serial.cmd
 else
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/dvi.cmd ${TEMPDIR}/disk/user.scr
- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.scr
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/dvi.cmd ${TEMPDIR}/disk/boot.scr
+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
  sudo cp -v ${DIR}/scripts/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.cmd
 fi
 
diff --git a/scripts/squeeze-preseed.cfg b/scripts/squeeze-preseed.cfg
index 30e86be..1bae481 100644
--- a/scripts/squeeze-preseed.cfg
+++ b/scripts/squeeze-preseed.cfg
@@ -1,5 +1,5 @@
 # Individual additional packages to install
-d-i pkgsel/include string uboot-mkimage pastebinit initramfs-tools
+d-i pkgsel/include string uboot-mkimage pastebinit initramfs-tools wget firmware-linux
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
@@ -20,4 +20,6 @@ d-i finish-install/reboot_in_progress note
 # still a usable /target directory. You can chroot to /target and use it
 # directly, or use the apt-install and in-target commands to easily install
 # packages and run commands in the target system.
-d-i preseed/late_command string apt-install parted; in-target /sbin/parted /dev/mmcblk0 set 1 boot on
+d-i preseed/late_command \
+string apt-install parted; in-target /sbin/parted /dev/mmcblk0 set 1 boot on ;
+
diff --git a/scripts/squeeze-tweaks.diff b/scripts/squeeze-tweaks.diff
index 6212ad4..148fe82 100644
--- a/scripts/squeeze-tweaks.diff
+++ b/scripts/squeeze-tweaks.diff
@@ -8,13 +8,13 @@ index 0000000..6d06fc7
 +cp /etc/e2fsck.conf /target/etc/e2fsck.conf
 +
 +if [ -e /etc/rcn.conf ]; then
-+	#mkdir -p /tmp/mmc
-+	#mount /dev/mmcblk0p1 /tmp/mmc
-+	#rm -f /tmp/mmc/boot.scr /tmp/mmc/netinstall.scr
-+	#cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr
-+	#rm -f  /tmp/mmc/uInitrd.net
-+	#sync
-+
++	mkdir -p /tmp/mmc
++	mount /dev/mmcblk0p1 /tmp/mmc
++	rm -f /tmp/mmc/boot.scr
++	mv /tmp/mmc/user.scr /tmp/mmc/boot.scr
++	rm -f  /tmp/mmc/uInitrd.net
++	sync
++	umount /tmp/mmc
 +
 +
 +	mkdir -p /target/boot/uboot