diff --git a/cmd/cloudinitsave/cloudinitsave.go b/cmd/cloudinitsave/cloudinitsave.go
index 4b1f17ec..75050031 100644
--- a/cmd/cloudinitsave/cloudinitsave.go
+++ b/cmd/cloudinitsave/cloudinitsave.go
@@ -81,7 +81,11 @@ func MountConfigDrive() error {
 		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 {
diff --git a/scripts/run b/scripts/run
index 36e96fe2..5e19514a 100755
--- a/scripts/run
+++ b/scripts/run
@@ -182,6 +182,8 @@ if [ "$QIND" != "1" ]; then
             CLOUD_CONFIG_DISK="-cdrom ${BASE}/state/configdrive.iso"
         ;;
         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} \