From 9d4aa827c9e42308d82eebc218bfcfef38f83ff2 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Tue, 18 Dec 2018 16:10:54 +0100
Subject: [PATCH] TT#45552  Revert "TT#45502 Patch vboxsf when building against
 Debian/buster fails"

This reverts commit 805bfcbabb05feddaf848e150ab13f565c8fa26a.

Debian's virtualbox 5.2.18-dfsg-2 (which provides a working
virtualbox-guest-dkms) included a fix to build against kernel 4.18,
nowadays virtualbox 5.2.22-dfsg-2 is available in Debian/testing
(AKA upcoming buster) repository.

Change-Id: Id8ee9d5d646a46275447e0e5ea4e9f7d14588962
---
 templates/scripts/includes/deployment.sh | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh
index b9ba5f9..19ce777 100755
--- a/templates/scripts/includes/deployment.sh
+++ b/templates/scripts/includes/deployment.sh
@@ -1827,26 +1827,6 @@ vagrant_configuration() {
   tail -10 "${TARGET}/var/log/VBoxGuestAdditions.log"
   umount "${TARGET}/media/cdrom/"
 
-  if [[ "$DEBIAN_RELEASE" == "buster" ]] && grep -q 'error: passing argument' "${TARGET}/var/log/vboxadd-setup.log"* ; then
-    echo "Applying Virtualbox workaround for buster and kernel >=4.18"
-    cat > "${TARGET}/tmp/vbox-kernel-fix.sh" << EOT
-#!/bin/bash
-set -e -o pipefail
-cd /opt/VBoxGuestAdditions-5.2.18/src/vboxguest-5.2.18/vboxsf
-wget --retry-connrefused --no-verbose -c "${SIPWISE_URL}/files/VirtualBox-kernel-4.18.patch"
-if ! echo "c585cd24e078df9f458e493d412ce7e4cc9a581bf79ed50da4b2a570b366fff6  VirtualBox-kernel-4.18.patch" | sha256sum --check ; then
- echo "Error: failed to compute checksum for Virtualbox patch. Exiting."
- exit 1
-fi
-patch -p1 < VirtualBox-kernel-4.18.patch
-make
-make install
-depmod -a
-EOT
-
-    UTS_RELEASE=$KERNELVERSION LD_PRELOAD=/tmp/fake-uname.so grml-chroot "${TARGET}" /bin/bash /tmp/vbox-kernel-fix.sh
-  fi
-
   # VBoxLinuxAdditions.run chooses /usr/lib64 as soon as this directory exists, which
   # is the case for our PRO systems shipping the heartbeat-2 package; then the
   # symlink /sbin/mount.vboxsf points to the non-existing /usr/lib64/VBoxGuestAdditions/mount.vboxsf