APTUPGRADE="aptitude -y safe-upgrade $DPKG_OPTIONS"
fi
else
- APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS"
+ APTINSTALL="apt-get -y --no-install-recommends install $DPKG_OPTIONS"
APTUPDATE="apt-get update $DPKG_OPTIONS"
- APTUPGRADE="apt-get --force-yes -y upgrade $DPKG_OPTIONS"
+ APTUPGRADE="apt-get -y upgrade $DPKG_OPTIONS"
fi
if [ -z "$STAGES" ] ; then
fi
if [ -z "$COMPONENTS" ] ; then
- COMPONENTS='main contrib non-free'
+ COMPONENTS='main'
fi
echo "Using repository components $COMPONENTS"
apt-get update $DPKG_OPTIONS
else
# make sure we have the keys available for aptitude
- gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
- gpg --export F61E2E7CECDEA787 | apt-key add - || true # not yet sure
+ gpg --keyserver subkeys.pgp.net --recv-keys 709BCE51568573EBC160E590F61E2E7CECDEA787
+ gpg --export 709BCE51568573EBC160E590F61E2E7CECDEA787 | apt-key add - || true # not yet sure
# why it's necessary, sometimes we get an error even though it works [mika]
fi
KVER=$(get_kernel_version)
if [ -n "$KVER" ] ; then
# note: install busybox to be able to debug initramfs
- KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free firmware-linux"
+ KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free"
+ # only add firmware-linux if we have non-free as a component
+ if expr "$COMPONENTS" : '.*non-free' >/dev/null ; then
+ KERNELPACKAGES="$KERNELPACKAGES firmware-linux"
+ fi
DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
else
echo "Warning: Could not find a kernel for your system. Your system won't be able to boot itself!"
echo "Installing grub on ${GRUB}:"
grub-install --no-floppy "$GRUB"
done
+ rm -f /boot/grub/device.map
else
echo "Installing grub on ${GRUB}:"
case "$RELEASE" in
lenny|squeeze|wheezy)
grub-install --no-floppy "$(readlink -f "${GRUB}")"
+ rm -f /boot/grub/device.map
;;
*)
echo "(hd0) ${GRUB}" > /boot/grub/device.map