zfs: Keep trying root import until it works

Works around #11003.
2016-07-13 01:18:48 +01:00 · 2016-07-13 01:18:48 +01:00 · 98b213a110
commit 98b213a110
parent 52a875fb23
1 changed files with 13 additions and 2 deletions
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@ -247,8 +247,19 @@ in
              esac
            done
            ''] ++ (map (pool: ''
-            echo "importing root ZFS pool \"${pool}\"..."
-            zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE "${pool}"
+            echo -n "importing root ZFS pool \"${pool}\"..."
+            trial=0
+            until msg="$(zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE '${pool}' 2>&1)"; do
+              sleep 0.25
+              echo -n .
+              trial=$(($trial + 1))
+              if [[ $trial -eq 60 ]]; then
+                echo
+                echo "$msg"
+                break
+              fi
+            done
+            echo
        '') rootPools));
      };