From da69a464fbcbccbb7decb39a6d5a9b16304e5ca7 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Thu, 18 Aug 2016 15:35:39 -0700
Subject: [PATCH] Replace partprobe with partx

---
 cmd/cloudinitexecute/cloudinitexecute.go | 6 ------
 images/01-base/Dockerfile                | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/cmd/cloudinitexecute/cloudinitexecute.go b/cmd/cloudinitexecute/cloudinitexecute.go
index 1fca179d..7b944869 100644
--- a/cmd/cloudinitexecute/cloudinitexecute.go
+++ b/cmd/cloudinitexecute/cloudinitexecute.go
@@ -150,12 +150,6 @@ func resizeDevice(cfg *rancherConfig.CloudConfig) error {
 		return err
 	}
 
-	cmd = exec.Command("partprobe")
-	err = cmd.Run()
-	if err != nil {
-		return err
-	}
-
 	cmd = exec.Command("resize2fs", fmt.Sprintf("%s1", cfg.Rancher.ResizeDevice))
 	err = cmd.Run()
 	if err != nil {
diff --git a/images/01-base/Dockerfile b/images/01-base/Dockerfile
index b328c2d3..6929c088 100644
--- a/images/01-base/Dockerfile
+++ b/images/01-base/Dockerfile
@@ -33,6 +33,7 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
     echo '%sudo ALL=(ALL) ALL' >> /etc/sudoers
 COPY inputrc /etc/inputrc
 COPY growpart /usr/bin/growpart
-RUN sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf
+RUN sed -i s/"partx --update \"\$part\" \"\$dev\""/"partx --update --nr \"\$part\" \"\$dev\""/g /usr/bin/growpart && \
+    sed -i -e 's/duid/clientid/g' /etc/dhcpcd.conf
 
 ENTRYPOINT ["/usr/bin/ros", "entrypoint"]