these kinda work, but flash-kernel still won in the end, more testing

pull/8/head
Robert Nelson 15 years ago committed by Robert Nelson
parent 0f5f567f3d
commit f736315de7

@ -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

@ -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
}

@ -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.
Loading…
Cancel
Save