diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-22 11:02:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-22 11:02:40 +0200 |
| commit | 55a7d75889507a9882c91f8c0a44ea9460a5d095 (patch) | |
| tree | e4d40e8bdb76614317edbd6d07f1d226eb80bb39 /testing/networkmanager/disable_set_hostname.patch | |
| parent | f23b8ed12499118d66340154fe8369623da3da34 (diff) | |
| parent | 297a042ac9a7bbd2b18a9551f5fa4fe43faf53b2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/rfkill/PKGBUILD
extra/libkgapi/PKGBUILD
extra/transmission/PKGBUILD
testing/grep/PKGBUILD
testing/grep/grep.install
Diffstat (limited to 'testing/networkmanager/disable_set_hostname.patch')
| -rw-r--r-- | testing/networkmanager/disable_set_hostname.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch deleted file mode 100644 index ee95dd0e1..000000000 --- a/testing/networkmanager/disable_set_hostname.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c ---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 -+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 -@@ -302,6 +302,7 @@ - return; - } - -+#if 0 - /* Try automatically determined hostname from the best device's IP config */ - if (!best4) - best4 = get_best_ip4_device (policy->manager, &best_req4); -@@ -356,6 +357,7 @@ - } - } - -+#endif - /* If no automatically-configured hostname, try using the hostname from - * when NM started up. - */ |