Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a90075d7
Commit
a90075d7
authored
Aug 05, 2015
by
Dawn Chen
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12008 from smarterclayton/fix_mac
mktemp on OSX behaves differently than Linux
parents
9a29583f
1a64830e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
etcd.sh
hack/lib/etcd.sh
+1
-1
util.sh
hack/lib/util.sh
+1
-1
No files found.
hack/lib/etcd.sh
View file @
a90075d7
...
@@ -39,7 +39,7 @@ kube::etcd::start() {
...
@@ -39,7 +39,7 @@ kube::etcd::start() {
fi
fi
# Start etcd
# Start etcd
ETCD_DIR
=
$(
mktemp
-d
-t
test-etcd.XXXXXX
)
ETCD_DIR
=
$(
mktemp
-d
2>/dev/null
||
mktemp
-d
-t
test-etcd.XXXXXX
)
kube::log::info
"etcd -data-dir
${
ETCD_DIR
}
--bind-addr
${
host
}
:
${
port
}
>/dev/null 2>/dev/null"
kube::log::info
"etcd -data-dir
${
ETCD_DIR
}
--bind-addr
${
host
}
:
${
port
}
>/dev/null 2>/dev/null"
etcd
-data-dir
${
ETCD_DIR
}
--bind-addr
${
host
}
:
${
port
}
>
/dev/null 2>/dev/null &
etcd
-data-dir
${
ETCD_DIR
}
--bind-addr
${
host
}
:
${
port
}
>
/dev/null 2>/dev/null &
ETCD_PID
=
$!
ETCD_PID
=
$!
...
...
hack/lib/util.sh
View file @
a90075d7
...
@@ -54,7 +54,7 @@ kube::util::wait_for_url() {
...
@@ -54,7 +54,7 @@ kube::util::wait_for_url() {
# KUBE_TEMP
# KUBE_TEMP
kube::util::ensure-temp-dir
()
{
kube::util::ensure-temp-dir
()
{
if
[[
-z
${
KUBE_TEMP
-
}
]]
;
then
if
[[
-z
${
KUBE_TEMP
-
}
]]
;
then
KUBE_TEMP
=
$(
mktemp
-d
-t
kubernetes.XXXXXX
)
KUBE_TEMP
=
$(
mktemp
-d
2>/dev/null
||
mktemp
-d
-t
kubernetes.XXXXXX
)
fi
fi
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment