public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: Keep trying root import until it works

Browse Source 
Works around #11003.
This commit is contained in:
Svein Ove Aas 2016-07-13 01:18:48 +01:00
parent 52a875fb23
commit 98b213a110
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));
}; };