mirror of
https://github.com/rancher/os.git
synced 2025-08-30 21:26:09 +00:00
Bump Go to 1.7.1
This commit is contained in:
parent
a22075aef2
commit
9e14a9da5a
@ -94,7 +94,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
|
||||
DOCKER_VERSION=${DOCKER_VERSION} \
|
||||
DOWNLOADS=/usr/src/downloads \
|
||||
GOPATH=/go \
|
||||
GO_VERSION=1.6.2 \
|
||||
GO_VERSION=1.7.1 \
|
||||
GOARCH=$ARCH \
|
||||
HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
|
||||
IMAGE_NAME=${IMAGE_NAME} \
|
||||
|
@ -1,24 +1,18 @@
|
||||
265,270d264
|
||||
< // Ensure only one update at a time checks resolv.conf.
|
||||
< if !conf.tryAcquireSema() {
|
||||
< return
|
||||
< }
|
||||
< defer conf.releaseSema()
|
||||
<
|
||||
276a271,280
|
||||
296a297,300
|
||||
> conf.update(name)
|
||||
> }
|
||||
>
|
||||
> func (conf *resolverConfig) update(name string) {
|
||||
> // Ensure only one update at a time checks resolv.conf.
|
||||
> if !conf.tryAcquireSema() {
|
||||
> return
|
||||
> }
|
||||
> defer conf.releaseSema()
|
||||
>
|
||||
293a298,302
|
||||
300a305,316
|
||||
> }
|
||||
>
|
||||
> func UpdateDnsConf() {
|
||||
> resolvConf.initOnce.Do(resolvConf.init)
|
||||
>
|
||||
> // Ensure only one update at a time checks resolv.conf.
|
||||
> if !resolvConf.tryAcquireSema() {
|
||||
> return
|
||||
> }
|
||||
> defer resolvConf.releaseSema()
|
||||
>
|
||||
> resolvConf.update("/etc/resolv.conf")
|
||||
|
Loading…
Reference in New Issue
Block a user