Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable

This commit is contained in:
Nico Schottelius 2014-06-13 13:34:42 +02:00
55 changed files with 759 additions and 176 deletions

View file

@ -24,12 +24,12 @@
#
# 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'
exit 0
fi
if ! command -v ifconfig; then
if ! command -v ifconfig >/dev/null; then
# no ifconfig, nothing we could do
exit 0
fi