From 5b9ef4dcad68aecf88f60b103d3d0f97b1350405 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 15 Aug 2012 10:58:38 -0500
Subject: [PATCH] move: etc/fstab addition of /boot/uboot to chroot script over
 the busybox script

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 scripts/debian-finish.sh   | 7 +++++++
 scripts/debian-tweaks.diff | 4 +---
 scripts/ubuntu-finish.sh   | 7 +++++++
 scripts/ubuntu-tweaks.diff | 4 +---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/scripts/debian-finish.sh b/scripts/debian-finish.sh
index 83aab71..8ae98b1 100644
--- a/scripts/debian-finish.sh
+++ b/scripts/debian-finish.sh
@@ -49,6 +49,13 @@ rm -f /boot/uboot/linux-image-*_1.0*_arm*.deb || true
 
 cat etc/inittab | grep -v '#' | grep SERIAL || echo "T2:23:respawn:/sbin/getty -L SERIAL 115200 vt102" >> /etc/inittab && echo "#" >> /etc/inittab
 
+boot_fstype=$(cat /boot/uboot/SOC.sh | grep boot_fstype | awk -F"=" '{print $2}')
+if [ "x${boot_fstype}" == "xext2" ] ; then
+	echo "/dev/mmcblk0p1    /boot/uboot    ext2    defaults    0    2" >> /etc/fstab
+else
+	echo "/dev/mmcblk0p1    /boot/uboot    auto    defaults    0    0" >> /etc/fstab
+fi
+
 #Debug:
 mount > /boot/uboot/backup/mount.log
 
diff --git a/scripts/debian-tweaks.diff b/scripts/debian-tweaks.diff
index 8fe56a3..b636941 100644
--- a/scripts/debian-tweaks.diff
+++ b/scripts/debian-tweaks.diff
@@ -3,7 +3,7 @@ new file mode 100755
 index 0000000..6d06fc7
 --- /dev/null
 +++ b/usr/lib/finish-install.d/08rcn-ee-finish-installing-device
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,30 @@
 +#!/bin/sh -e
 +cp /etc/e2fsck.conf /target/etc/e2fsck.conf
 +cp /etc/finish-install.sh /target/etc/finish-install.sh
@@ -11,8 +11,6 @@ index 0000000..6d06fc7
 +
 +if [ -f /etc/rcn.conf ]; then
 +	mkdir -p /target/boot/uboot
-+	echo "/dev/mmcblk0p1   /boot/uboot auto   defaults            0   0" >> /target/etc/fstab
-+
 +	mount /dev/mmcblk0p1 /target/boot/uboot
 +
 +	#smsc95xx kevent workaround/hack
diff --git a/scripts/ubuntu-finish.sh b/scripts/ubuntu-finish.sh
index c457f5c..ddde243 100644
--- a/scripts/ubuntu-finish.sh
+++ b/scripts/ubuntu-finish.sh
@@ -89,6 +89,13 @@ cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img
 
 rm -f /boot/uboot/linux-image-*_1.0*_arm*.deb || true
 
+boot_fstype=$(cat /boot/uboot/SOC.sh | grep boot_fstype | awk -F"=" '{print $2}')
+if [ "x${boot_fstype}" == "xext2" ] ; then
+	echo "/dev/mmcblk0p1    /boot/uboot    ext2    defaults    0    2" >> /etc/fstab
+else
+	echo "/dev/mmcblk0p1    /boot/uboot    auto    defaults    0    0" >> /etc/fstab
+fi
+
 #Debug:
 mount > /boot/uboot/backup/mount.log
 
diff --git a/scripts/ubuntu-tweaks.diff b/scripts/ubuntu-tweaks.diff
index 6691c19..022b810 100644
--- a/scripts/ubuntu-tweaks.diff
+++ b/scripts/ubuntu-tweaks.diff
@@ -3,7 +3,7 @@ new file mode 100755
 index 0000000..6d06fc7
 --- /dev/null
 +++ b/usr/lib/finish-install.d/08rcn-ee-finish-installing-device
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,31 @@
 +#!/bin/sh -e
 +cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
 +cp /etc/SERIAL.conf /target/etc/init/SERIAL.conf
@@ -12,8 +12,6 @@ index 0000000..6d06fc7
 +
 +if [ -f /etc/rcn.conf ]; then
 +	mkdir -p /target/boot/uboot
-+	echo "/dev/mmcblk0p1   /boot/uboot auto   defaults            0   0" >> /target/etc/fstab
-+
 +	mount /dev/mmcblk0p1 /target/boot/uboot
 +
 +	#smsc95xx kevent workaround/hack