Attachment #166825 for bug #239098




		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);

		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:

Return to bug 239098

Lines 783-796 Link Here

(-)dhcpcd.c (+4 lines)
783	case 'H': /* FALLTHROUGH */	783	case 'H': /* FALLTHROUGH */
784	case 'M':	784	case 'M':
785	del_option_mask(options->requestmask, DHO_MTU);	785	del_option_mask(options->requestmask, DHO_MTU);
		786	add_environ(options, "skip_hook=mtu", 0);
786	break;	787	break;
787	case 'N':	788	case 'N':
788	del_option_mask(options->requestmask, DHO_NTPSERVER);	789	del_option_mask(options->requestmask, DHO_NTPSERVER);
		790	add_environ(options, "skip_hook=ntp.conf", 0);
789	break;	791	break;
790	case 'R':	792	case 'R':
791	del_option_mask(options->requestmask, DHO_DNSSERVER);	793	del_option_mask(options->requestmask, DHO_DNSSERVER);
792	del_option_mask(options->requestmask, DHO_DNSDOMAIN);	794	del_option_mask(options->requestmask, DHO_DNSDOMAIN);
793	del_option_mask(options->requestmask, DHO_DNSSEARCH);	795	del_option_mask(options->requestmask, DHO_DNSSEARCH);
		796	add_environ(options, "skip_hook=resolv.conf", 0);
794	break;	797	break;
795	case 'S':	798	case 'S':
796	add_option_mask(options->requestmask, DHO_MSCSR);	799	add_option_mask(options->requestmask, DHO_MSCSR);
Lines 798-803 Link Here
798	case 'Y':	801	case 'Y':
799	del_option_mask(options->requestmask, DHO_NISSERVER);	802	del_option_mask(options->requestmask, DHO_NISSERVER);
800	del_option_mask(options->requestmask, DHO_NISDOMAIN);	803	del_option_mask(options->requestmask, DHO_NISDOMAIN);
		804	add_environ(options, "skip_hook=yp.conf", 0);
801	break;	805	break;
802	#endif	806	#endif
803	default:	807	default: