diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2011-01-10 12:44:27 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2011-01-10 12:44:27 -0600 |
| commit | 4851069dfdd41d5cf9071f04ab48fc11b61ccd81 (patch) | |
| tree | 801cfe14b0d7b3a90af43d1ce8d241028b63b435 /network/NetworkManager/patches/dhcpcd-prevent-dhcpcd-from-messing-with-routing-bgo-.patch | |
| parent | 68c0f83fbbf1e39803c1f76321b50b99a2b124ba (diff) | |
| download | slackbuilds-4851069dfdd41d5cf9071f04ab48fc11b61ccd81.tar.gz | |
network/NetworkManager: Included several patches from upstream
This commit adds quite a few patches from the upstream
NM_0_8 git branch. Most of them are bugfix-only patches,
but the two dealing with /etc/hosts policy are changes in
behavior. This *should* be an improvement for us, but if
you notice any ill effects, please advise.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network/NetworkManager/patches/dhcpcd-prevent-dhcpcd-from-messing-with-routing-bgo-.patch')
| -rw-r--r-- | network/NetworkManager/patches/dhcpcd-prevent-dhcpcd-from-messing-with-routing-bgo-.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/network/NetworkManager/patches/dhcpcd-prevent-dhcpcd-from-messing-with-routing-bgo-.patch b/network/NetworkManager/patches/dhcpcd-prevent-dhcpcd-from-messing-with-routing-bgo-.patch new file mode 100644 index 0000000000..3b37412308 --- /dev/null +++ b/network/NetworkManager/patches/dhcpcd-prevent-dhcpcd-from-messing-with-routing-bgo-.patch @@ -0,0 +1,26 @@ +From d60a988518cb0851488bc21732271a971877cdcd Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Thu, 18 Nov 2010 16:30:00 -0600 +Subject: [PATCH 1/4] dhcpcd: prevent dhcpcd from messing with routing (bgo #634983) + +Since NM is already handling that. +--- + src/dhcp-manager/nm-dhcp-dhcpcd.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c +index 378a97b..4fb703c 100644 +--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c ++++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c +@@ -128,6 +128,8 @@ real_ip4_start (NMDHCPClient *client, + + g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL since we use avahi-autoipd */ + ++ g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */ ++ + g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */ + g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH ); + +-- +1.7.3.4 + |