@@ -312,17 +312,10 @@ impl VmDriver {
312312
313313 #[ must_use]
314314 pub fn capabilities ( & self ) -> GetCapabilitiesResponse {
315- let gpu_count = self
316- . gpu_inventory
317- . as_ref ( )
318- . and_then ( |inv| inv. lock ( ) . ok ( ) )
319- . map_or ( 0 , |inv| inv. gpu_count ( ) ) ;
320315 GetCapabilitiesResponse {
321316 driver_name : DRIVER_NAME . to_string ( ) ,
322317 driver_version : openshell_core:: VERSION . to_string ( ) ,
323318 default_image : self . config . default_image . clone ( ) ,
324- supports_gpu : self . gpu_inventory . is_some ( ) ,
325- gpu_count,
326319 }
327320 }
328321
@@ -1522,25 +1515,23 @@ fn parse_registry_reference(image_ref: &str) -> Result<Reference, Status> {
15221515/// `DOCKER_HOST`). If Docker is unavailable, falls back to the Podman
15231516/// socket, which exposes a Docker-compatible API.
15241517async fn connect_local_container_engine ( ) -> Option < Docker > {
1525- if let Ok ( docker) = Docker :: connect_with_local_defaults ( ) {
1526- if docker. ping ( ) . await . is_ok ( ) {
1527- return Some ( docker ) ;
1528- }
1518+ if let Ok ( docker) = Docker :: connect_with_local_defaults ( )
1519+ && docker. ping ( ) . await . is_ok ( )
1520+ {
1521+ return Some ( docker ) ;
15291522 }
15301523
15311524 let podman_socket = podman_socket_path ( ) ;
1532- if podman_socket. exists ( ) {
1533- if let Ok ( docker) =
1525+ if podman_socket. exists ( )
1526+ && let Ok ( docker) =
15341527 Docker :: connect_with_unix ( podman_socket. to_str ( ) ?, 120 , bollard:: API_DEFAULT_VERSION )
1535- {
1536- if docker. ping ( ) . await . is_ok ( ) {
1537- info ! (
1538- socket = %podman_socket. display( ) ,
1539- "vm driver: connected to Podman (Docker-compatible API)"
1540- ) ;
1541- return Some ( docker) ;
1542- }
1543- }
1528+ && docker. ping ( ) . await . is_ok ( )
1529+ {
1530+ info ! (
1531+ socket = %podman_socket. display( ) ,
1532+ "vm driver: connected to Podman (Docker-compatible API)"
1533+ ) ;
1534+ return Some ( docker) ;
15441535 }
15451536
15461537 None
0 commit comments