mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 20:14:49 +00:00
Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major
This commit is contained in:
@@ -125,7 +125,8 @@ pub async fn set_enabled(
|
||||
.as_interface_mut()
|
||||
.ser(&iface)
|
||||
})
|
||||
.await?;
|
||||
.await
|
||||
.result?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -216,7 +217,8 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
|
||||
Ok(())
|
||||
})
|
||||
})
|
||||
.await?;
|
||||
.await
|
||||
.result?;
|
||||
Ok(())
|
||||
}
|
||||
#[derive(Deserialize, Serialize, Parser, TS)]
|
||||
@@ -288,7 +290,8 @@ pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result
|
||||
})?;
|
||||
wifi.as_selected_mut().ser(&Some(ssid))
|
||||
})
|
||||
.await?;
|
||||
.await
|
||||
.result?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -334,7 +337,8 @@ pub async fn remove(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<
|
||||
wifi.as_selected_mut()
|
||||
.map_mutate(|s| Ok(s.filter(|s| s == &ssid.0)))
|
||||
})
|
||||
.await?;
|
||||
.await
|
||||
.result?;
|
||||
Ok(())
|
||||
}
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
@@ -830,6 +834,7 @@ impl WpaCli {
|
||||
.ser(&new_country)
|
||||
})
|
||||
.await
|
||||
.result
|
||||
}
|
||||
async fn check_active_network(&self, ssid: &Ssid) -> Result<Option<NetworkId>, Error> {
|
||||
Ok(self
|
||||
|
||||
Reference in New Issue
Block a user