From 4e872be75ab2b96440c620e26cd4bca77b57ad05 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 25 Feb 2025 11:26:08 +1100 Subject: [PATCH] Vagrant: use login shell on Oracular and use TMPDIR can't compile wxpython without a different TMPDIR --- Tools/vagrant/initvagrant.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Tools/vagrant/initvagrant.sh b/Tools/vagrant/initvagrant.sh index 3da7d92442..46b3ed19f4 100755 --- a/Tools/vagrant/initvagrant.sh +++ b/Tools/vagrant/initvagrant.sh @@ -13,6 +13,11 @@ if [ $who != 'root' ]; then exit 1 fi +DISTRIBUTION_ID=$(lsb_release -i -s) +if [ ${DISTRIBUTION_ID} == 'Ubuntu' ]; then + DISTRIBUTION_CODENAME=$(lsb_release -c -s) +fi + VAGRANT_USER=ubuntu if [ -e /home/vagrant ]; then # prefer vagrant user @@ -32,8 +37,21 @@ if [ ! $IS_BENTO ]; then sudo resize2fs /dev/sda1 fi +DASHDASHLOGIN="" +if [ ${DISTRIBUTION_CODENAME} == 'oracular' ]; then + # we run out of space in tmpfs /tmp while compiling wxpython, so + # do it elsewhere: +cat <<"EOF" | sudo -H -u vagrant bash + mkdir -p $HOME/tmp + echo "export TMPDIR=$HOME/tmp" >>$HOME/.bashrc + echo "export TMPDIR=$HOME/tmp" >>$HOME/.profile +EOF + export TMPDIR=/home/vagrant/tmp + DASHDASHLOGIN="--login" +fi + echo "calling pre-reqs script..." -sudo -H -u $VAGRANT_USER /vagrant/Tools/environment_install/install-prereqs-ubuntu.sh -y +sudo $DASHDASHLOGIN -H -u $VAGRANT_USER /vagrant/Tools/environment_install/install-prereqs-ubuntu.sh -y echo "...pre-reqs script done... initvagrant.sh continues." # valgrind support: