ubuntu: move flash-kernel.conf to chroot script

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/10/merge
Robert Nelson 12 years ago
parent 50dce8e3b3
commit ecc50b8982

@ -1,4 +1,3 @@
Easy: Easy:
* debug.log, to help troubleshoot failures (do we need anything else /boot/uboot/backup/* after install) * debug.log, to help troubleshoot failures (do we need anything else /boot/uboot/backup/* after install)
* random http link to *.deb package (--deb-file just needs to be extended to http case, as it works for local files) * random http link to *.deb package (--deb-file just needs to be extended to http case, as it works for local files)
* move most of scripts/*tweaks.diff to scripts/*finish.sh as the *.diff is stuck with busybox limiations..

@ -971,7 +971,6 @@ function initrd_preseed_settings {
case "${DIST}" in case "${DIST}" in
maverick|natty|oneiric|precise|quantal) maverick|natty|oneiric|precise|quantal)
patch -p1 < "${DIR}/scripts/ubuntu-tweaks.diff" patch -p1 < "${DIR}/scripts/ubuntu-tweaks.diff"
cp -v "${DIR}/scripts/flash-kernel.conf" ${TEMPDIR}/initrd-tree/etc/flash-kernel.conf
cp -v "${DIR}/scripts/ubuntu-finish.sh" ${TEMPDIR}/initrd-tree/etc/finish-install.sh cp -v "${DIR}/scripts/ubuntu-finish.sh" ${TEMPDIR}/initrd-tree/etc/finish-install.sh
;; ;;
squeeze|wheezy) squeeze|wheezy)

@ -1,21 +0,0 @@
#!/bin/sh
UBOOT_PART=/dev/mmcblk0p1
echo "flash-kernel stopped by: /etc/flash-kernel.conf"
echo "You are currently running an image built by rcn-ee.net running an rcn-ee"
echo "kernel, to use Ubuntu's Kernel remove the next line"
USE_RCN_EE_KERNEL=1
if [ "${USE_RCN_EE_KERNEL}" ] ; then
DIST=$(lsb_release -cs)
case "${DIST}" in
lucid)
exit 0
;;
maverick|natty|oneiric|precise|quantal)
FLASH_KERNEL_SKIP=yes
;;
esac
fi

@ -111,3 +111,27 @@ if [ "x${smsc95xx_mem}" != "x" ] ; then
echo "vm.min_free_kbytes = ${smsc95xx_mem}" >> /etc/sysctl.conf echo "vm.min_free_kbytes = ${smsc95xx_mem}" >> /etc/sysctl.conf
fi fi
cat > /etc/flash-kernel.conf <<-__EOF__
#!/bin/sh
UBOOT_PART=/dev/mmcblk0p1
echo "flash-kernel stopped by: /etc/flash-kernel.conf"
echo "You are currently running an image built by rcn-ee.net running an rcn-ee"
echo "kernel, to use Ubuntu's Kernel remove the next line"
USE_RCN_EE_KERNEL=1
if [ "\${USE_RCN_EE_KERNEL}" ] ; then
DIST=\$(lsb_release -cs)
case "\${DIST}" in
lucid)
exit 0
;;
maverick|natty|oneiric|precise|quantal)
FLASH_KERNEL_SKIP=yes
;;
esac
fi
__EOF__

@ -3,9 +3,8 @@ new file mode 100755
index 0000000..6d06fc7 index 0000000..6d06fc7
--- /dev/null --- /dev/null
+++ b/usr/lib/finish-install.d/08rcn-ee-finish-installing-device +++ b/usr/lib/finish-install.d/08rcn-ee-finish-installing-device
@@ -0,0 +1,27 @@ @@ -0,0 +1,26 @@
+#!/bin/sh -e +#!/bin/sh -e
+cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
+cp /etc/finish-install.sh /target/etc/finish-install.sh +cp /etc/finish-install.sh /target/etc/finish-install.sh
+chmod a+x /target/etc/finish-install.sh +chmod a+x /target/etc/finish-install.sh
+ +

Loading…
Cancel
Save