alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source 
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
parent 409b53cba8 98b213a110
commit c2e5fd959d
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nixos/modules/tasks/filesystems/zfs.nix
View file

@ -247,8 +247,19 @@ in
esac esac
done done
''] ++ (map (pool: '' ''] ++ (map (pool: ''
echo "importing root ZFS pool \"${pool}\"..." echo -n "importing root ZFS pool \"${pool}\"..."
zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE "${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)); '') rootPools));
}; };