diff options
Diffstat (limited to 'src/dhcp/nm-dhcp-dhcpcd.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-dhcpcd.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c index 2a7482b1..c300bbe2 100644 --- a/src/dhcp/nm-dhcp-dhcpcd.c +++ b/src/dhcp/nm-dhcp-dhcpcd.c @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* nm-dhcp-dhcpcd.c - dhcpcd specific hooks for NetworkManager * * Copyright (C) 2008 Roy Marples @@ -100,9 +99,9 @@ ip4_start (NMDhcpClient *client, iface = nm_dhcp_client_get_iface (client); /* dhcpcd does not allow custom pidfiles; the pidfile is always - * RUNDIR "dhcpcd-<ifname>.pid". + * RUNSTATEDIR "dhcpcd-<ifname>.pid". */ - priv->pid_file = g_strdup_printf (RUNDIR "/dhcpcd-%s.pid", iface); + priv->pid_file = g_strdup_printf (RUNSTATEDIR "/dhcpcd-%s.pid", iface); dhcpcd_path = nm_dhcp_dhcpcd_get_path (); if (!dhcpcd_path) { @@ -180,18 +179,6 @@ ip4_start (NMDhcpClient *client, return TRUE; } -static gboolean -ip6_start (NMDhcpClient *client, - const char *dhcp_anycast_addr, - const struct in6_addr *ll_addr, - NMSettingIP6ConfigPrivacy privacy, - guint needed_prefixes, - GError **error) -{ - nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "dhcpcd plugin does not support IPv6"); - return FALSE; -} - static void stop (NMDhcpClient *client, gboolean release) { @@ -251,7 +238,6 @@ nm_dhcp_dhcpcd_class_init (NMDhcpDhcpcdClass *dhcpcd_class) object_class->dispose = dispose; client_class->ip4_start = ip4_start; - client_class->ip6_start = ip6_start; client_class->stop = stop; } |