rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-09 18:48:05 +00:00
Code Issues Releases Wiki Activity

Fix ISO based cloud-config drive

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-02-22 03:46:54 +00:00
parent 2fb7651b60
commit 69be7de1c4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cloudinitsave/cloudinitsave.go
View File

@ -81,7 +81,11 @@ func MountConfigDrive() error {
return mount.Mount(configDevName, configDevMountPoint, "9p", "trans=virtio,version=9p2000.L") return mount.Mount(configDevName, configDevMountPoint, "9p", "trans=virtio,version=9p2000.L")
} }
return mount.Mount(configDev, configDevMountPoint, "iso9660,vfat", "") fsType, err := util.GetFsType(configDev)
if err != nil {
return err
}
return mount.Mount(configDev, configDevMountPoint, fsType, "ro")
} }
func UnmountConfigDrive() error { func UnmountConfigDrive() error {

2
scripts/run
View File

@ -182,6 +182,8 @@ if [ "$QIND" != "1" ]; then
CLOUD_CONFIG_DISK="-cdrom ${BASE}/state/configdrive.iso" CLOUD_CONFIG_DISK="-cdrom ${BASE}/state/configdrive.iso"
;; ;;
fat) fat)
echo "TODO: implement a vfat formated qemu img & copy the config files into it"
exit 1
;; ;;
*) *)
CLOUD_CONFIG_DISK="-fsdev local,security_model=passthrough,readonly,id=fsdev0,path=${CCROOT} \ CLOUD_CONFIG_DISK="-fsdev local,security_model=passthrough,readonly,id=fsdev0,path=${CCROOT} \