From facd833e6dd9e3859701e176ef31bb166c0fd486 Mon Sep 17 00:00:00 2001 From: Tabakhase Date: Fri, 16 Feb 2018 06:53:10 +0100 Subject: [PATCH] Vagrant - sendfile python3.5 debian-stretch (#12454) * vagrant dev - force hass-AIOHTTP to not use sendfile Ref: https://www.virtualbox.org/ticket/9069 strongly needed for `home-assistant-polymer` * vagrant dev - python 3.4 to 3.5 by upgrade to debian-stretch --- virtualization/vagrant/Vagrantfile | 2 +- virtualization/vagrant/home-assistant@.service | 3 +++ virtualization/vagrant/provision.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/virtualization/vagrant/Vagrantfile b/virtualization/vagrant/Vagrantfile index 21d5bd04adc..e50c4e6de00 100644 --- a/virtualization/vagrant/Vagrantfile +++ b/virtualization/vagrant/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| - config.vm.box = "debian/contrib-jessie64" + config.vm.box = "debian/contrib-stretch64" config.vm.synced_folder "../../", "/home-assistant" config.vm.synced_folder "./config", "/root/.homeassistant" config.vm.network "forwarded_port", guest: 8123, host: 8123 diff --git a/virtualization/vagrant/home-assistant@.service b/virtualization/vagrant/home-assistant@.service index 8e520952db9..91b7307f30f 100644 --- a/virtualization/vagrant/home-assistant@.service +++ b/virtualization/vagrant/home-assistant@.service @@ -16,5 +16,8 @@ ExecStart=/usr/bin/hass --runner SendSIGKILL=no RestartForceExitStatus=100 +# on vagrant (vboxfs), disable sendfile https://www.virtualbox.org/ticket/9069 +Environment=AIOHTTP_NOSENDFILE=1 + [Install] WantedBy=multi-user.target diff --git a/virtualization/vagrant/provision.sh b/virtualization/vagrant/provision.sh index da5d48c6f18..d4ef4e0b446 100755 --- a/virtualization/vagrant/provision.sh +++ b/virtualization/vagrant/provision.sh @@ -105,7 +105,7 @@ main() { vagrant up --provision; exit ;; esac # ...otherwise we assume it's the Vagrant provisioner - if [ $(hostname) != "contrib-jessie" ]; then usage; exit; fi + if [ $(hostname) != "contrib-jessie" ] && [ $(hostname) != "contrib-stretch" ]; then usage; exit; fi if ! [ -f $SETUP_DONE ]; then setup; fi if [ -f $RESTART ]; then restart; fi if [ -f $RUN_TESTS ]; then run_tests; fi