GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-10-27 16:00:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 虚拟媒体支持同时挂载多个镜像

Browse Source
This commit is contained in:
mofeng-git
2026-07-12 11:40:01 +08:00
parent c9ae9dd893
commit 7c9166a8cf
24 changed files with 1513 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/redfish/routes/virtual_media.rs
View File

@@ -70,19 +70,13 @@ async fn virtual_media_detail(
Some(msd) => {
let msd_state = msd.state().await;
let img_name = msd_state
.current_image
.as_ref()
.map(|i| i.name.clone())
.or_else(|| {
msd_state
.drive_info
.as_ref()
.map(|_| "Virtual Drive".to_string())
});
.mounted_media
.first()
.map(|media| media.name.clone());
(
msd_state.connected,
!msd_state.mounted_media.is_empty(),
img_name,
if msd_state.connected {
if !msd_state.mounted_media.is_empty() {
Some("Applet".to_string())
} else {
None
@@ -153,7 +147,7 @@ async fn virtual_media_insert(
None => return service_unavailable("MSD not available"),
};
if msd.state().await.connected {
if !msd.state().await.mounted_media.is_empty() {
return (
StatusCode::CONFLICT,
Json(RedfishError::general_error(
@@ -164,7 +158,7 @@ async fn virtual_media_insert(
}
info!("Redfish: VirtualMedia.InsertMedia image='{}'", req.image);
msd.connect_drive().await
msd.mount_drive().await
};
match result {
@@ -201,7 +195,7 @@ async fn virtual_media_eject(
None => return service_unavailable("MSD not available"),
};
if !msd.state().await.connected {
if msd.state().await.mounted_media.is_empty() {
return (
StatusCode::CONFLICT,
Json(RedfishError::general_error("No virtual media inserted")),