diff --git a/lib/distro.conf b/lib/distro.conf index 7151506..686f042 100755 --- a/lib/distro.conf +++ b/lib/distro.conf @@ -1,6 +1,5 @@ #!/bin/bash -unset rcn_ee_repo unset UBOOTWRAPPER case "${DISTARCH}-${debian_boot}" in trusty-armhf-netboot) @@ -11,7 +10,6 @@ trusty-armhf-netboot) HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" BASE_IMAGE="generic/netboot" NETINSTALL="initrd.gz" - rcn_ee_repo="enable" ;; wheezy-armhf-netboot) #24-Apr-2014 @@ -22,7 +20,6 @@ wheezy-armhf-netboot) BASE_IMAGE="mx5/netboot/efikamx" UBOOTWRAPPER=1 NETINSTALL="uInitrd" - rcn_ee_repo="enable" ;; jessie-armhf-netboot) #08-Feb-2014 @@ -32,6 +29,6 @@ jessie-armhf-netboot) HTTP_IMAGE="http://ftp.debian.org/debian/dists" BASE_IMAGE="armmp/netboot" NETINSTALL="initrd.gz" - rcn_ee_repo="enable" ;; esac +# diff --git a/mk_mmc.sh b/mk_mmc.sh index abff1aa..aac5452 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -928,23 +928,17 @@ initrd_preseed_settings () { setup_parition_recipe cp -v "${DIR}/lib/${DIST}-preseed.cfg" ${TEMPDIR}/initrd-tree/preseed.cfg + #repos.rcn-ee.net: add linux-image-${uname -r} + sed -i -e 's:initramfs-tools:initramfs-tools linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg + cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image + case "${DIST}" in - trusty) - sed -i -e 's:initramfs-tools:initramfs-tools linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg - cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image - ;; wheezy) if [ ! "x${di_serial_mode}" = "xenable" ] && [ "${conf_kernel_usb_not_builtin}" ] ; then sed -i -e 's:#d-i console-tools:d-i console-tools:g' ${TEMPDIR}/initrd-tree/preseed.cfg sed -i -e 's:#d-i debian-installer:d-i debian-installer:g' ${TEMPDIR}/initrd-tree/preseed.cfg sed -i -e 's:#d-i console-keymaps-at:d-i console-keymaps-at:g' ${TEMPDIR}/initrd-tree/preseed.cfg fi - sed -i -e 's:initramfs-tools:initramfs-tools linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg - cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image - ;; - jessie) - sed -i -e 's:initramfs-tools:initramfs-tools linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg - cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image ;; esac @@ -1304,9 +1298,6 @@ populate_boot () { fi - if [ ! "x${rcn_ee_repo}" = "xenable" ] ; then - cp -v "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/disk/ - fi cp -v ${TEMPDIR}/kernel/${linux_version}-modules.tar.gz ${TEMPDIR}/disk/ #This should be compatible with hwpacks variable names..