Skip to content

Commit d8ac4d9

Browse files
authored
CA-403700 use iso9660 file system for updates (#6216)
Be explicit about the file system of an update ISO. Remove dead code.
2 parents f2f6d20 + 5689150 commit d8ac4d9

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

ocaml/xapi/xapi_pool_update.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ let attach_helper ~__context ~uuid ~vdi ~use_localhost_proxy =
291291
"/dev/" ^ Client.VBD.get_device ~rpc ~session_id ~self:vbd
292292
)
293293
in
294-
with_api_errors (mount device) mount_point ;
294+
with_api_errors (mount ~ty:(Some "iso9660") device) mount_point ;
295295
debug "pool_update.attach_helper Mounted %s" mount_point
296296
) ;
297297
let ip =

ocaml/xenopsd/xc/xenops_server_xen.ml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2465,9 +2465,8 @@ module VM = struct
24652465
| true ->
24662466
Unixext.with_file path [Unix.O_RDONLY] 0o600 f_synced
24672467
| false ->
2468-
with_mounted_dir_ro path @@ fun dir ->
2469-
let filename = Filename.concat dir "suspend-image" in
2470-
Unixext.with_file filename [Unix.O_RDONLY] 0o600 f_synced
2468+
error "%s: can't mount %s" __FUNCTION__ path ;
2469+
internal_error "can't mount %s (not a file or block dev)" path
24712470
)
24722471

24732472
let wait_ballooning task vm =

0 commit comments

Comments
 (0)