diff --git a/deployment.sh b/deployment.sh index 11b674f..d2cbe08 100755 --- a/deployment.sh +++ b/deployment.sh @@ -249,26 +249,17 @@ grml_debootstrap_upgrade() { fi } -# we need version >=4.3.14-1~bpo70+1 for usage with recent kernel versions -install_vbox_package() { - echo "Installing virtualbox-guest-additions-iso" +install_vbox_iso() { + echo "Downloading virtualbox-guest-additions ISO" - # use temporary apt database for speed reasons - local TMPDIR - TMPDIR=$(mktemp -d) - mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \ - "${TMPDIR}/cachedir/archives/partial" - echo "deb ${DEBIAN_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/debian/ ${DEBIAN_RELEASE} non-free" > \ - "${TMPDIR}/etc/sources.list" + local vbox_checksum="1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a" # sha256 + local vbox_iso="VBoxGuestAdditions_5.1.14.iso" - DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ - -o dir::state="${TMPDIR}/statedir" -o dir::etc="${TMPDIR}/etc" \ - -o dir::etc::trustedparts="/etc/apt/trusted.gpg.d/" update + mkdir -p "/usr/share/virtualbox/" + vbox_isofile="/usr/share/virtualbox/${vbox_iso}" + wget -c -O "$vbox_isofile" "https://deb.sipwise.com/files/${vbox_iso}" - DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ - -o dir::etc="${TMPDIR}/etc" -o dir::state="${TMPDIR}/statedir" \ - -o dir::etc::trustedparts="/etc/apt/trusted.gpg.d/" \ - -y --no-install-recommends install virtualbox-guest-additions-iso + echo "${vbox_checksum} ${vbox_isofile}" | sha256sum --check || die "Error: failed to compute checksum for Virtualbox ISO. Exiting." } ensure_augtool_present() { @@ -2097,7 +2088,7 @@ vagrant_configuration() { sed -ri -e "s/mesg\s+n/# adjusted for Vagrant\ntty -s \&\& mesg n/" "${TARGET}/root/.profile" fi - install_vbox_package + install_vbox_iso # required for fake_uname and VBoxLinuxAdditions.run grml-chroot $TARGET apt-get -y install libc6-dev gcc @@ -2113,7 +2104,6 @@ vagrant_configuration() { die "Error: no kernel version could be identified." fi - vbox_isofile="/usr/share/virtualbox/VBoxGuestAdditions.iso" if [ ! -r "$vbox_isofile" ] ; then die "Error: could not find $vbox_isofile" fi