Imported upstream version '2.0.2' of 'upstream'

CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog for package turtlebot4_setup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.0.2 (2024-10-23)
+------------------
+* Add e2fsck to SD-flasher script
+* Bump default version numbers
+* Fix default hostname to match released SD card images
+* Append `p2` for `mmcblk` devices, but just `2` for `sd*` devices when expanding the last partition
+* Contributors: Chris Iverach-Brereton
+
 2.0.1 (2024-10-04)
 ------------------
 * Add a copy of the boot/firmware files to /etc/turtlebot for reference in case users modify these and want a clean, offline copy for reference

etc/turtlebot4/system

@@ -1,4 +1,4 @@
 MODEL:lite
-VERSION:2.0.0
+VERSION:2.0.2
 ROS:Jazzy
-HOSTNAME:ubuntu
+HOSTNAME:turtlebot4

package.xml

@@ -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>2.0.1</version>
+  <version>2.0.2</version>
   <description>Turtlebot4 setup scripts</description>
   <maintainer email="[email protected]">rkreinin</maintainer>
   <license>Apache 2.0</license>

scripts/sd_flash.sh

@@ -41,6 +41,13 @@ sudo dcfldd if=$1 sizeprobe=if bs=1M$of
 
 for device in $device_names
 do
+    if [[ $device == mmcblk* ]]; then
+        last_partition="${device}p2"
+    else
+        last_partition="${device}2"
+    fi
+
+    sudo e2fsck -f /dev/${last_partition}
     sudo growpart /dev/$device 2
-    sudo resize2fs /dev/${device}p2
+    sudo resize2fs /dev/${last_partition}
 done

turtlebot4_setup/conf.py

@@ -88,9 +88,9 @@ class Conf():
 
     default_system_conf = {
         SystemOptions.MODEL: 'lite',
-        SystemOptions.VERSION: '2.0.0',
+        SystemOptions.VERSION: '2.0.2',
         SystemOptions.ROS: 'Jazzy',
-        SystemOptions.HOSTNAME: 'ubuntu',
+        SystemOptions.HOSTNAME: 'turtlebot4',
     }
 
     default_wifi_conf = {