aboutsummaryrefslogtreecommitdiff
path: root/conf.d
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2013-03-18 18:29:36 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2013-08-13 16:33:41 -0500
commit838c9efb36b3b058c5a5b9d0e8c6d4d4789a44b9 (patch)
tree4d30e9357d1f666ea37186b8a95dbe83c86b4dc8 /conf.d
parentb2f8ac9382d5dad70181ef803a37f43896f5cb91 (diff)
Remove gentoo's net.* scripts
It has been determined that it will be best for gentoo's net.* scripts to be in a separate package to allow independent development. This package will be called netifrc and maintained by Gentoo.
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/Makefile4
-rw-r--r--conf.d/net4
2 files changed, 3 insertions, 5 deletions
diff --git a/conf.d/Makefile b/conf.d/Makefile
index 24db5891..aefb6121 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,8 +1,10 @@
+include ../mk/net.mk
+
DIR= ${CONFDIR}
CONF= bootmisc fsck hostname localmount netmount urandom tmpfiles \
${CONF-${OS}}
-ifeq (${MKNET},)
+ifeq (${MKNET},yes)
CONF+= network staticroute
TARGETS+= network staticroute
CLEANFILES+= network staticroute
diff --git a/conf.d/net b/conf.d/net
deleted file mode 100644
index 52a03e36..00000000
--- a/conf.d/net
+++ /dev/null
@@ -1,4 +0,0 @@
-# This blank configuration will automatically use DHCP for any net.*
-# scripts in /etc/init.d. To create a more complete configuration,
-# please review /usr/share/doc/openrc*/net.example* and save your configuration
-# in /etc/conf.d/net (this file :]!).