Annotation of /trunk/networkmanager/patches/networkmanager-0.8.1-hostname.patch
Parent Directory
| 
Revision Log
Revision 1152 -
(hide annotations)
(download)
Mon Sep 27 19:54:46 2010 UTC (13 years, 8 months ago) by niro
File size: 625 byte(s)
Mon Sep 27 19:54:46 2010 UTC (13 years, 8 months ago) by niro
File size: 625 byte(s)
-rebased patch
| 1 | niro | 1152 | diff -Naur NetworkManager-0.8.1/src/nm-policy.c NetworkManager-0.8.1-magellan/src/nm-policy.c |
| 2 | --- NetworkManager-0.8.1/src/nm-policy.c 2010-07-22 01:48:36.000000000 +0200 | ||
| 3 | +++ NetworkManager-0.8.1-magellan/src/nm-policy.c 2010-09-27 22:00:47.000000000 +0200 | ||
| 4 | @@ -287,6 +287,7 @@ | ||
| 5 | return; | ||
| 6 | } | ||
| 7 | |||
| 8 | +#if 0 | ||
| 9 | /* Try automatically determined hostname from the best device's IP config */ | ||
| 10 | if (!best) | ||
| 11 | best = get_best_ip4_device (policy->manager, &best_req); | ||
| 12 | @@ -317,6 +318,7 @@ | ||
| 13 | dhcp4_hostname); | ||
| 14 | } | ||
| 15 | } | ||
| 16 | +#endif | ||
| 17 | |||
| 18 | /* If no automatically-configured hostname, try using the hostname from | ||
| 19 | * when NM started up. |