diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-09 09:50:29 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-09 09:50:29 +0200 |
commit | 4d0f0293b0108f751d79e5a060534fbc9575f7bb (patch) | |
tree | 93c28176dfd2491e899d2ffb967c671abddc8ab8 /community-staging/open-vm-tools/scripts-network-FS19541.patch | |
parent | 2cf785af142618fb225778622b1d94a016c18462 (diff) | |
parent | 1fed401c439c264bd92a4c13af1bea0bea458cb4 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gawk/PKGBUILD
libre/linux-libre/PKGBUILD
staging/icu/PKGBUILD
testing/cairo/PKGBUILD
Diffstat (limited to 'community-staging/open-vm-tools/scripts-network-FS19541.patch')
-rw-r--r-- | community-staging/open-vm-tools/scripts-network-FS19541.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/community-staging/open-vm-tools/scripts-network-FS19541.patch b/community-staging/open-vm-tools/scripts-network-FS19541.patch deleted file mode 100644 index 5fcb33ba8..000000000 --- a/community-staging/open-vm-tools/scripts-network-FS19541.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- network.orig 2011-11-09 18:42:28.000000000 +0400 -+++ network 2011-11-09 18:46:22.000000000 +0400 -@@ -76,7 +76,7 @@ - else - echo `date` "[rescue_nic] activating $nic ..." - -- ifup $nic -+ ifconfig $nic up - exitCode=`expr $exitCode \| $?` - fi - done < $activeList -@@ -105,7 +105,7 @@ - # `which' may be a bit noisy, so we'll shush it. - dbusSend=`which dbus-send 2>/dev/null` - rc=$? -- if [ $rc = 0 ]; then -+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.8.0 - $dbusSend --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ -@@ -154,7 +154,7 @@ - # `which' may be a bit noisy, so we'll shush it. - dbusSend=`which dbus-send 2>/dev/null` - rc=$? -- if [ $rc = 0 ]; then -+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.8.0 - $dbusSend --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ -@@ -203,7 +203,7 @@ - - # XXX Are these really necessary? If so, we should have seen customer - # complaints by now. -- which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -+# which ifup >/dev/null 2>&1 || Panic "ifup not in search path." - which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." - - case "$1" in |