movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Jan Tojnar 2020-08-23 02:00:50 +02:00
commit 91104b5417
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
417 changed files with 14414 additions and 8866 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/stage-1-init.sh
View file

@ -378,12 +378,14 @@ mountFS() {
mkdir -p "/mnt-root$mountPoint"
# For CIFS mounts, retry a few times before giving up.
# For ZFS and CIFS mounts, retry a few times before giving up.
# We do this for ZFS as a workaround for issue NixOS/nixpkgs#25383.
local n=0
while true; do
mount "/mnt-root$mountPoint" && break
if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
if [ \( "$fsType" != cifs -a "$fsType" != zfs \) -o "$n" -ge 10 ]; then fail; break; fi
echo "retrying..."
sleep 1
n=$((n + 1))
done