Skip to content

Commit

Permalink
Rebase from 'release/humble/turtlebot4_setup'
Browse files Browse the repository at this point in the history
  • Loading branch information
civerachb-cpr committed Jan 14, 2025
1 parent 41b20d1 commit 7903f52
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 91 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package turtlebot4_setup
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.0.5 (2025-01-14)
------------------
* Remove dhcp true because it was causing eth0 to lose the static IP (`#17 <https://github.com/turtlebot/turtlebot4_setup/issues/17>`_)
* Change the post-install chrony file command from mv to cp. Only copy if the file actually exists.
* Contributors: Chris Iverach-Brereton, Hilary Luo

1.0.4 (2024-07-02)
------------------
* Multi-robot discovery server support (`#11 <https://github.com/turtlebot/turtlebot4_setup/issues/11>`)
Expand Down
4 changes: 3 additions & 1 deletion debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

PKG="turtlebot4_setup"

sudo mv /etc/turtlebot4/chrony.conf /etc/chrony/chrony.conf
if [ -f /etc/turtlebot4/chrony.conf ]; then
sudo cp /etc/turtlebot4/chrony.conf /etc/chrony/chrony.conf
fi
sudo service chrony restart
sudo systemctl enable webserver.service
sudo systemctl disable systemd-networkd-wait-online.service
Expand Down
1 change: 0 additions & 1 deletion etc/netplan/40-ethernets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ network:
eth0:
addresses:
- 192.168.185.3/24
dhcp4: true
optional: true
usb0:
addresses:
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>turtlebot4_setup</name>
<version>1.0.4</version>
<version>1.0.5</version>
<description>Turtlebot4 setup scripts</description>
<maintainer email="[email protected]">rkreinin</maintainer>
<license>Apache 2.0</license>
Expand Down
88 changes: 0 additions & 88 deletions rpm/template.spec.em

This file was deleted.

0 comments on commit 7903f52

Please sign in to comment.