3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #16901 from Baughn/zfs-nvme-fix

zfs: Keep trying root import until it works
This commit is contained in:
Ricardo M. Correia 2016-08-18 17:26:43 +02:00 committed by GitHub
commit c2e5fd959d

View file

@ -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));
};