From: Roy Marples <roy@marples.name>
Date: Wed, 1 Oct 2008 10:43:38 +0000 (+0000)
Subject: Fix compat options, Gentoo #239098.
X-Git-Tag: v4.0.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4df6a3dec8d2d23ad28cac031a4c9d558c8ebd3;p=thirdparty%2Fdhcpcd.git

Fix compat options, Gentoo #239098.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index a438bfdb..dd1677e0 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -783,14 +783,17 @@ main(int argc, char **argv)
 		case 'H': /* FALLTHROUGH */
 		case 'M':
 			del_option_mask(options->requestmask, DHO_MTU);
+			add_environ(options, "skip_hook=mtu", 0);
 			break;
 		case 'N':
 			del_option_mask(options->requestmask, DHO_NTPSERVER);
+			add_environ(options, "skip_hook=ntp.conf", 0);
 			break;
 		case 'R':
 			del_option_mask(options->requestmask, DHO_DNSSERVER);
 			del_option_mask(options->requestmask, DHO_DNSDOMAIN);
 			del_option_mask(options->requestmask, DHO_DNSSEARCH);
+			add_environ(options, "skip_hook=resolv.conf", 0);
 			break;
 		case 'S':
 			add_option_mask(options->requestmask, DHO_MSCSR);
@@ -798,6 +801,7 @@ main(int argc, char **argv)
 		case 'Y':
 			del_option_mask(options->requestmask, DHO_NISSERVER);
 			del_option_mask(options->requestmask, DHO_NISDOMAIN);
+			add_environ(options, "skip_hook=yp.conf", 0);
 			break;
 #endif
 		default: