From f736315de786860d0c1c0aa67940b664ea17038b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 19 Apr 2010 17:03:50 -0500
Subject: [PATCH] these kinda work, but flash-kernel still won in the end, more
 testing

---
 mk_mmc.sh                                     |  6 ++++++
 .../beagle-lucid-override-flash-kernel.diff   | 20 +++++++++++++++++++
 scripts/beagle-use-normal.scr-for-boot.diff   | 17 ++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 scripts/beagle-lucid-override-flash-kernel.diff
 create mode 100644 scripts/beagle-use-normal.scr-for-boot.diff

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 576b05c..e2a95e6 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -107,6 +107,12 @@ fi
  sudo rm -rfd ${DIR}/initrd-tree/lib/modules/${KERNEL}/kernel/fs/
  sudo rm -rfd ${DIR}/initrd-tree/lib/modules/${KERNEL}/kernel/sound/
 
+# if test "-$DIST-" = "-lucid-"
+# then
+#   sudo patch -p1 -s < ${DIR}/scripts/beagle-lucid-override-flash-kernel.diff
+#   sudo patch -p1 -s < ${DIR}/scripts/beagle-use-normal.scr-for-boot.diff
+# fi
+
  find . | cpio -o -H newc | gzip -9 > ${DIR}/initrd.mod.gz
  cd ${DIR}/
  sudo rm -f ${DIR}/initrd.mod || true
diff --git a/scripts/beagle-lucid-override-flash-kernel.diff b/scripts/beagle-lucid-override-flash-kernel.diff
new file mode 100644
index 0000000..5fe78f3
--- /dev/null
+++ b/scripts/beagle-lucid-override-flash-kernel.diff
@@ -0,0 +1,20 @@
+diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh
+index 4a92c4f..7663f3f 100644
+--- a/lib/chroot-setup.sh
++++ b/lib/chroot-setup.sh
+@@ -109,6 +109,15 @@ EOF
+ 	# Avoid apt-listchanges doing anything.
+ 	APT_LISTCHANGES_FRONTEND=none
+ 	export APT_LISTCHANGES_FRONTEND
++	cat > /target/etc/flash-kernel.conf <<FK
++#!/bin/sh
++
++echo "flash-kernel stopped:"
++echo "You are currently running the Community Kernel edition"
++echo "remove /etc/flash-kernel.conf to run Ubuntu's Kernel"
++exit
++
++FK
+ 
+ 	return 0
+ }
diff --git a/scripts/beagle-use-normal.scr-for-boot.diff b/scripts/beagle-use-normal.scr-for-boot.diff
new file mode 100644
index 0000000..293dbdc
--- /dev/null
+++ b/scripts/beagle-use-normal.scr-for-boot.diff
@@ -0,0 +1,17 @@
+diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh
+index f582297..c98a5d5 100644
+--- a/lib/chroot-setup.sh
++++ b/lib/chroot-setup.sh
+@@ -129,6 +129,12 @@ chroot_cleanup () {
+ 		mv /target/sbin/initctl.REAL /target/sbin/initctl
+ 	fi
+ 
++	mkdir -p /tmp/mmc 
++	mount /dev/mmcblk0p1 /tmp/mmc
++	rm -f /tmp/mmc/boot.scr
++	mv /tmp/mmc/normal.scr /tmp/mmc/boot.scr
++	umount /tmp/mmc
++
+ 	# Undo the mounts done by the packages during installation.
+ 	# Reverse sorting to umount the deepest mount points first.
+ 	# Items with count of 1 are new.