From a99a1c7540c3cc0301e5361c21d9aece344fe2b9 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <urpylka@gmail.com>
Date: Sat, 23 Jun 2018 20:36:50 +0300
Subject: [PATCH] image_builder: change PARTUUID to /dev/mmcblk0p2

---
 image_builder/build.Jenkinsfile           |  4 ++++
 image_builder/scripts/change_boot_part.sh | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100755 image_builder/scripts/change_boot_part.sh

diff --git a/image_builder/build.Jenkinsfile b/image_builder/build.Jenkinsfile
index 2865e130..1caffb7e 100644
--- a/image_builder/build.Jenkinsfile
+++ b/image_builder/build.Jenkinsfile
@@ -81,9 +81,13 @@ pipeline {
     }
     // TODO: Add finalising step, transfer mirror removal from ros.sh
     stage('Shrink image') {
+      environment {
+        EXECUTE_FILE = 'image_builder/scripts/change_boot_part.sh'
+      }
       when { expression { return params.SHRINK } }
       steps {
         sh "$WORKSPACE/image_builder/autosizer.sh ${params.BUILD_DIR}/${params.IMAGE_NAME}"
+        sh "$WORKSPACE/image_builder/image_config.sh execute ${params.BUILD_DIR}/${params.IMAGE_NAME} ${params.MOUNT_POINT} $WORKSPACE/$EXECUTE_FILE"
       }
     }
   }
diff --git a/image_builder/scripts/change_boot_part.sh b/image_builder/scripts/change_boot_part.sh
new file mode 100755
index 00000000..bca48d7a
--- /dev/null
+++ b/image_builder/scripts/change_boot_part.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+echo -e "\033[0;31m\033[1m$(date) | #1 Change boot partition\033[0m\033[0m"
+
+sed -i 's/root=[^ ]*/root=\/dev\/mmcblk0p2/' /boot/cmdline.txt
+sed -i 's/.*  \/boot           vfat    defaults          0       2$/\/dev\/mmcblk0p1  \/boot           vfat    defaults          0       2/' /etc/fstab
+sed -i 's/.*  \/               ext4    defaults,noatime  0       1$/\/dev\/mmcblk0p2  \/               ext4    defaults,noatime  0       1/' /etc/fstab
+
+echo -e "\033[0;31m\033[1m$(date) | End of change boot partition\033[0m\033[0m"