Revert "dhcpcd: Install a minimal configuration"
This reverts commit 92fe21c3feb87e0a09ee27db105075407b29c126.
CQ-DEPEND=CL:205589
BUG=chromium:360452
TEST=Emerge package
Change-Id: Ie1d4ac24f33c0f122c5135ccb2d100f34da16d5b
Reviewed-on: https://chromium-review.googlesource.com/205630
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
diff --git a/Makefile b/Makefile
index 2ddea04..5fc72f2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
CFLAGS+= -std=${CSTD}
include config.mk
-FILES+= dhcpcd.conf dhcpcd-minimal.conf dhcpcd-dbus.conf
+FILES+= dhcpcd.conf dhcpcd-dbus.conf
_DBUSCFLAGS_SH= $(PKG_CONFIG) --cflags dbus-1
_DBUSCFLAGS!= ${_DBUSCFLAGS_SH}
@@ -81,7 +81,6 @@
# dhcpcd config file
${INSTALL} -d ${DESTDIR}${SYSCONFDIR}
${INSTALL} -m ${CONFMODE} dhcpcd.conf ${DESTDIR}${SYSCONFDIR}
- ${INSTALL} -m ${CONFMODE} dhcpcd-minimal.conf ${DESTDIR}${SYSCONFDIR}
# dhcpcd d-bus registration file (note file rename)
${INSTALL} -d ${DESTDIR}${DBUSDIR}
${INSTALL} -m ${CONFMODE} dhcpcd-dbus.conf \
diff --git a/dhcpcd-minimal.conf b/dhcpcd-minimal.conf
deleted file mode 100644
index 1fee457..0000000
--- a/dhcpcd-minimal.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# A sample configuration for dhcpcd.
-# See dhcpcd.conf(5) for details.
-
-# disable ARP checking
-noarp
-# no link state monitoring
-nolink
-
-# Inform the DHCP server of our hostname for DDNS.
-hostname
-# To share the DHCP lease across OSX and Windows a ClientID is needed.
-# Enabling this may get a different lease than the kernel DHCP client.
-# Some upstream DHCP servers may also require a ClientID, such as FRITZ!Box.
-clientid
-
-# A list of options to request from the DHCP server.
-option domain_name_servers
-
-# A ServerID is required by RFC2131.
-require dhcp_server_identifier
