rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1160 from joshwget/use-partx

Browse Source 
Replace partprobe with partx
This commit is contained in:
Darren Shepherd
2016-08-18 18:11:33 -07:00
committed by GitHub
parent 894aa8054b da69a464fb
commit 7a1609a398
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cloudinitexecute/cloudinitexecute.go
View File

@@ -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 {

3
images/01-base/Dockerfile
View File

@@ -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"]