1
0
mirror of https://github.com/rancher/os.git synced 2025-07-04 18:46:15 +00:00

Merge pull request #1015 from joshwget/resolve-device

Revolve device before performing cloud config mount
This commit is contained in:
Darren Shepherd 2016-06-15 16:34:19 -07:00 committed by GitHub
commit 01c3adc31b

View File

@ -221,7 +221,8 @@ func executeCloudConfig() error {
if len(configMount) != 4 { if len(configMount) != 4 {
log.Errorf("Unable to mount %s: must specify exactly four arguments", configMount[1]) log.Errorf("Unable to mount %s: must specify exactly four arguments", configMount[1])
} }
if err := mount.Mount(configMount[0], configMount[1], configMount[2], configMount[3]); err != nil { device := util.ResolveDevice(configMount[0])
if err := mount.Mount(device, configMount[1], configMount[2], configMount[3]); err != nil {
log.Errorf("Unable to mount %s: %s", configMount[1], err) log.Errorf("Unable to mount %s: %s", configMount[1], err)
} }
} }