bootstrap: chore: extract fn mount_modules

src/cmd/init/bootstrap.rs

@@ -18,11 +18,7 @@ pub async fn bootstrap(cfg: Config) {
     let verifier = retry(async || Verifier::from_config(&cfg)).await;
     let bs = cfg.bootstrap;
 
-    retry_or_ignore(async || {
-        mount(Some(&bs.dev), "/bootstrap", "ext4", None).await;
-        Ok(())
-    })
-    .await;
+    mount(Some(&bs.dev), "/bootstrap", "ext4", None).await;
 
     let boot_version = utils::param("version").unwrap_or("current");
     let base_dir = &format!("/bootstrap/{boot_version}");
@@ -104,15 +100,8 @@ impl Verifier {
 
         let mut openssl = Command::new("openssl")
             .stdin(Stdio::piped())
-            .args(&[
-                "dgst",
-                "-sha512",
-                "-verify",
-                "/dev/stdin",
-                "-signature",
-                &sig,
-                path,
-            ])
+            .args(&["dgst", "-sha512", "-verify", "/dev/stdin"])
+            .args(&["-signature", &sig, path])
             .spawn()?;
 
         tokio::io::copy(&mut pubkey, openssl.stdin.as_mut().unwrap()).await?;
@@ -232,15 +221,8 @@ async fn mount_system(cfg: &dkl::Config, bs_dir: &str, verifier: &Verifier) {
     })
     .await;
 
-    mount(
-        None,
-        "/system",
-        "overlay",
-        Some(&format!(
-            "lowerdir={lower_dir},upperdir={upper_dir},workdir={work_dir}"
-        )),
-    )
-    .await;
+    let opts = format!("lowerdir={lower_dir},upperdir={upper_dir},workdir={work_dir}");
+    mount(None, "/system", "overlay", Some(&opts)).await;
 
     // make root rshared (default in systemd, required by Kubernetes 1.10+)
     // equivalent to "mount --make-rshared /"