Skip to content

Commit

Permalink
Removed kernel upgrade for sshuttle workaround
Browse files Browse the repository at this point in the history
* Ubuntu 20.04 has a much newer kernel
  • Loading branch information
dcwangmit01 authored and hangxie committed May 1, 2020
1 parent 35a657a commit 93792d3
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions files/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ function vagrant() {
pushd /tmp
# Remove this workaround after bento releases new hyperv box
vagrant_disable_ssh_password_logins
vagrant_upgrade_kernel_workaround_sshuttle_kernel_bug
vagrant_bento_workaround_openssl_bug
layer_install_os_packages
layer_install_python_based_utils_and_libs
Expand Down Expand Up @@ -80,32 +79,6 @@ function vagrant_disable_ssh_password_logins() {
/etc/ssh/sshd_config
}

function vagrant_upgrade_kernel_workaround_sshuttle_kernel_bug() {
# https://github.com/sshuttle/sshuttle/issues/208
echo "#### ${FUNCNAME[0]}"

# Install a kernel upgrade helper
# Dkms will automatically recompile kmods upon kernel update
apt-add-repository -y ppa:teejee2008/ppa
apt-get update
apt-get -y -qq install dkms ukuu linux-headers-$(uname -r)

# Update virtualbox guest additions. This will rebuild kernel modules
wget -q -O /tmp/additions.iso \
http://download.virtualbox.org/virtualbox/6.0.4/VBoxGuestAdditions_6.0.4.iso
mkdir -p /cdrom
mount -o loop /tmp/additions.iso /cdrom
/cdrom/VBoxLinuxAdditions.run || true # always errors
umount /cdrom
rm -rf /cdrom /tmp/additions.iso

# Install a newer kernel
# dkms will kick in and rebuild modules for this new kernel
ukuu --list
ukuu --install v4.20.17
ukuu --list-installed
}

function vagrant_bento_workaround_openssl_bug() {
# https://github.com/chef/bento/issues/1201#issuecomment-503060115
echo "#### ${FUNCNAME[0]}"
Expand Down

0 comments on commit 93792d3

Please sign in to comment.