aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorficus <ficus@robocracy.org>2012-11-22 02:15:58 +0100
committerficus <ficus@robocracy.org>2012-11-22 02:15:58 +0100
commitc5126b9f9027fb3a63f9a4c9883356799ce14506 (patch)
tree09e398dc1ef7598fb96532897fc46ef868629ca5
parent71b3a24221a0742e594d7baed60dfe2234d710d1 (diff)
downloadtorouter-live-c5126b9f9027fb3a63f9a4c9883356799ce14506.tar.gz
torouter-live-c5126b9f9027fb3a63f9a4c9883356799ce14506.zip
clean up kernel hook
-rwxr-xr-xconfig/hooks/kernel-image.sh.chroot15
1 files changed, 8 insertions, 7 deletions
diff --git a/config/hooks/kernel-image.sh.chroot b/config/hooks/kernel-image.sh.chroot
index 31dbaf1..89e5cf5 100755
--- a/config/hooks/kernel-image.sh.chroot
+++ b/config/hooks/kernel-image.sh.chroot
@@ -2,14 +2,15 @@
set -e
-# TODO: this seems to be a null-op... flash-kernel is symlinked to `true`?
-# XXX: remove this
-#echo "Trying to flashing kernel..."
-#/usr/sbin/flash-kernel || echo "Failed to flash kernel! Don't worry, will mangle"
-#/usr/sbin/flash-kernel
+# This script adds the DreamPlug's device tree file to the kernel image,
+# generates uImage and uInitrd style files (for use with u-boot, as opposed to
+# syslinux-style images), and moves those files to /live.
echo "Mangling kernel..."
-mkdir /tmp/initrd-repack
+# TBD: is it necessary to do this first stage of mangling which removes the
+# conf/param.conf file, which may or may not be clobbering kernel boot
+# arguments?
+mkdir -p /tmp/initrd-repack
(cd /tmp/initrd-repack ; \
zcat /boot/initrd.img-* | cpio -i ; \
rm -f conf/param.conf ; \
@@ -28,5 +29,5 @@ rm -rf /tmp/initrd-repack
-d initrd.img uInitrd )
echo "Creating /live and copying in boot images..."
-mkdir /live
+mkdir -p /live
cp /boot/uInitrd /boot/uImage /boot/dtb /live