Skip to content

Commit 98b213a

Browse files
committed
zfs: Keep trying root import until it works
Works around #11003.
1 parent 52a875f commit 98b213a

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

  • nixos/modules/tasks/filesystems

nixos/modules/tasks/filesystems/zfs.nix

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,19 @@ in
247247
esac
248248
done
249249
''] ++ (map (pool: ''
250-
echo "importing root ZFS pool \"${pool}\"..."
251-
zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE "${pool}"
250+
echo -n "importing root ZFS pool \"${pool}\"..."
251+
trial=0
252+
until msg="$(zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE '${pool}' 2>&1)"; do
253+
sleep 0.25
254+
echo -n .
255+
trial=$(($trial + 1))
256+
if [[ $trial -eq 60 ]]; then
257+
echo
258+
echo "$msg"
259+
break
260+
fi
261+
done
262+
echo
252263
'') rootPools));
253264
};
254265

0 commit comments

Comments
 (0)