Skip to content

Commit

Permalink
Fixes for review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
arbuztw committed Sep 10, 2015
1 parent 08a766d commit 06ebe2f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions installer/functions
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ undotrap() {
# Check if we are able to mknod.
capmknod() {
local tmp=`mktemp -d --tmpdir=/tmp 'crouton-mknod.XXX'`
local ret=0
if ! mknod "$tmp/test-mknod" c 0 0; then
return 1
ret=1
fi
rm -rf "$tmp"
return 0
return $ret
}

# Check whether $1 is mounted with options $2.
Expand All @@ -101,6 +102,7 @@ checkmountopt() {
fi;;
esac
done
return 0
}

# Works mostly like built-in getopts but silently coalesces positional arguments.
Expand Down
2 changes: 1 addition & 1 deletion installer/ubuntu/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Check your internet connection or proxy settings and try again.'
fi
fi

# Patch debootstrap so that it retries downloading packages and not mounting /sys
# Patch debootstrap so that it retries downloading packages and does not mount /sys
echo 'Patching debootstrap...' 1>&2
if awk '
t == 3 && /warning RETRY/ { print "sleep 1"; t=4 }
Expand Down

0 comments on commit 06ebe2f

Please sign in to comment.