Merge branch 'master' of github.com:telmich/cdist

This commit is contained in:
Nico Schottelius 2014-05-04 08:43:22 +02:00
commit 1b0f74ed76

View file

@ -24,12 +24,12 @@
# #
# Use ip, if available # Use ip, if available
if command -v ip; then if command -v ip >/dev/null; then
ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p' ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
exit 0 exit 0
fi fi
if ! command -v ifconfig; then if ! command -v ifconfig >/dev/null; then
# no ifconfig, nothing we could do # no ifconfig, nothing we could do
exit 0 exit 0
fi fi