aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vagrant: fixes for Jammy virtual machine

Browse Source
This commit is contained in:
Peter Barker 2022-05-01 13:18:44 +10:00 committed by Peter Barker
parent 0cec5dccea
commit 5b3a01ecb3
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/vagrant/initvagrant-desktop.sh
View File

@ -44,6 +44,11 @@ sudo -u "$VAGRANT_USER" dbus-launch gsettings set org.gnome.desktop.session idle
sudo -u "$VAGRANT_USER" mkdir -p /home/"$VAGRANT_USER"/.config sudo -u "$VAGRANT_USER" mkdir -p /home/"$VAGRANT_USER"/.config
echo "yes" | sudo -u "$VAGRANT_USER" dd of=/home/"$VAGRANT_USER"/.config/gnome-initial-setup-done echo "yes" | sudo -u "$VAGRANT_USER" dd of=/home/"$VAGRANT_USER"/.config/gnome-initial-setup-done
# sssd is missing config:
if [ ${RELEASE_CODENAME} == 'jammy' ]; then
systemctl disable sssd
fi
# start the graphical environment right now: # start the graphical environment right now:
systemctl isolate graphical.target systemctl isolate graphical.target

11
Tools/vagrant/initvagrant.sh
View File

@ -61,6 +61,17 @@ echo "source $BASHRC_GIT" |
# link a half-way decent .mavinit.scr into place: # link a half-way decent .mavinit.scr into place:
sudo --login -u $VAGRANT_USER ln -sf /vagrant/Tools/vagrant/mavinit.scr /home/$VAGRANT_USER/.mavinit.scr sudo --login -u $VAGRANT_USER ln -sf /vagrant/Tools/vagrant/mavinit.scr /home/$VAGRANT_USER/.mavinit.scr
RELEASE_CODENAME=$(lsb_release -c -s)
# no multipath available, stop mutlipathd complaining about lack of data:
if [ ${RELEASE_CODENAME} == 'jammy' ]; then
cat >>/etc/multipath.conf <<EOF
blacklist { devnode "sda" }
blacklist { devnode "sdb" }
EOF
fi
#Plant a marker for sim_vehicle that we're inside a vagrant box #Plant a marker for sim_vehicle that we're inside a vagrant box
touch /ardupilot.vagrant touch /ardupilot.vagrant