From bb828d2429d455b02c9a9426196b3406c32063b3 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 22 Mar 2011 10:45:51 -0500
Subject: [PATCH] =?UTF-8?q?serial-mode=20bug=20in=20squeeze=20install=20no?=
 =?UTF-8?q?ticed=20by:=20Fernando=20Membrive=20Guill=C3=A9n,=20getty=20was?=
 =?UTF-8?q?=20starting=20twice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh                   | 7 ++++++-
 scripts/squeeze-tweaks.diff | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index c644b39..2e0fef3 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -30,7 +30,7 @@ unset BETA_KERNEL
 unset USB_ROOTFS
 unset PRINTK
 
-SCRIPT_VERSION="1.00"
+SCRIPT_VERSION="1.01"
 IN_VALID_UBOOT=1
 
 MIRROR="http://rcn-ee.net/deb/"
@@ -432,6 +432,11 @@ case "$DIST" in
 esac
 
  sudo touch ${TEMPDIR}/initrd-tree/etc/rcn.conf
+
+ if [ "${SERIAL_MODE}" ] ; then
+  sudo touch ${TEMPDIR}/initrd-tree/etc/rcn-serial.conf
+ fi
+
  cd ${TEMPDIR}/initrd-tree/
  find . | cpio -o -H newc | gzip -9 > ${TEMPDIR}/initrd.mod.gz
  cd ${DIR}/
diff --git a/scripts/squeeze-tweaks.diff b/scripts/squeeze-tweaks.diff
index 4f8136c..975da98 100644
--- a/scripts/squeeze-tweaks.diff
+++ b/scripts/squeeze-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,29 @@
+@@ -0,0 +1,31 @@
 +#!/bin/sh -e
 +cp /etc/e2fsck.conf /target/etc/e2fsck.conf
 +
@@ -26,7 +26,9 @@ index 0000000..6d06fc7
 +	#smsc95xx kevent workaround/hack
 +	echo "vm.min_free_kbytes = 8192" >> /target/etc/sysctl.conf
 +
++	if [ ! -e /etc/rcn-serial.conf ]; then
 +	cat /target/etc/inittab | grep ttyO2 || echo "S:2345:respawn:/sbin/getty 115200 ttyO2" >> /target/etc/inittab
++	fi
 +
 +	cp -ru /lib/firmware/ /target/lib/
 +