ubuntu: running out of space, so pick one initrd

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent 3ea7caf0c2
commit 0e844efcf3

@ -971,7 +971,6 @@ initrd_preseed_settings () {
flash_kernel_base_installer flash_kernel_base_installer
flash_kernel_broken flash_kernel_broken
;; ;;
wheezy) wheezy)
cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
;; ;;
@ -1261,9 +1260,13 @@ populate_boot () {
fi fi
if [ -f ${TEMPDIR}/initrd.mod.gz ] ; then if [ -f ${TEMPDIR}/initrd.mod.gz ] ; then
#This is 20+ MB in size, just copy one..
echo "Copying Kernel initrds:" echo "Copying Kernel initrds:"
if [ ${mkimage_zimage} ] ; then
mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net
else
cp -v ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/initrd.net cp -v ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/initrd.net
fi
echo "-----------------------------" echo "-----------------------------"
fi fi
@ -1497,6 +1500,7 @@ process_dtb_conf () {
conf_normal_initrd_file=initrd.img conf_normal_initrd_file=initrd.img
conf_net_initrd_file=initrd.net conf_net_initrd_file=initrd.net
else else
mkimage_initrd=1
conf_normal_initrd_file=uInitrd conf_normal_initrd_file=uInitrd
conf_net_initrd_file=uInitrd.net conf_net_initrd_file=uInitrd.net
fi fi

Loading…
Cancel
Save