Apply suggestions from code review

Co-authored-by: Leonard Göhrs <[email protected]>

Author: N3xp7im3

src/main.rs

@@ -54,18 +54,18 @@ fn read_file(filename: &str) -> std::result::Result<String, String> {
 }
 
 fn wait_for_device(root_device: &str) -> Result<()> {
-    let mut counter = 0;
-    while !Path::new(&root_device).exists() {
-        let duration = time::Duration::from_millis(5);
+    let duration = time::Duration::from_millis(5);
+    let path = Path::new(&root_device);
 
-        if counter > 1000 {
-            return Err("timout reached while waiting for the device".into());
+    for _ in 0..1000 {
+        if path.exists() {
+            return Ok(());
         }
 
         thread::sleep(duration);
-        counter += 1;
     }
-    Ok(())
+
+    Err("timout reached while waiting for the device".into())
 }
 
 /*

src/mount.rs

@@ -49,13 +49,10 @@ pub fn mount_root(options: &CmdlineOptions) -> Result<()> {
         return Err("root= not found in /proc/cmdline".into());
     }
 
-    if options.rootfstype != Some("nfs".to_string()) &&
-        options.rootfstype != Some("9p".to_string())
-    {
-        let root_device = options.root.as_ref().ok_or("No root device argument")?;
-        wait_for_device(root_device)?;
+    match options.rootfstype.as_deref() {
+        Some("nfs") | Some("9p") => (),
+        _ => wait_for_device(root)?,
     }
-
     mkdir("/root")?;
 
     debug!(