From 5994e55937cbbb71b1c22ad829b77a1bcd8c3793 Mon Sep 17 00:00:00 2001
From: William Hubbs <williamh@gentoo.org>
Date: Tue, 15 Nov 2011 17:06:10 -0600
Subject: Deprecate the network and staticroute scripts

These scripts are not supported, and they have several major design
issues such as not being able to stop, start or allow a dependency on a
single interface.
---
 init.d/Makefile       | 14 ++++----------
 init.d/network.in     |  6 ++++++
 init.d/staticroute.in |  5 +++++
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'init.d')

diff --git a/init.d/Makefile b/init.d/Makefile
index de8428a..8351f3c 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -4,15 +4,9 @@ SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
 	sysctl.in urandom.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
-# Build our old net foo or not
-ifeq (${MKOLDNET},yes)
-_OLDNET=	net.lo
-endif
-_NET_LO=	${_OLDNET}
-
-INSTALLAFTER=	_installafter_${_NET_LO}
-CLEANFILES+=	${_NET_LO}
-TARGETS+=	${_NET_LO}
+INSTALLAFTER=	_installafter_net.lo
+CLEANFILES+=	net.lo
+TARGETS+=	net.lo
 
 MK=	../mk
 include ${MK}/os.mk
@@ -45,4 +39,4 @@ include ${MK}/scripts.mk
 _installafter_: realinstall
 
 _installafter_net.lo: realinstall
-	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO}
+	${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO-${OS}}
diff --git a/init.d/network.in b/init.d/network.in
index bd68391..c934129 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -219,6 +219,12 @@ start()
 		eend $?
 	fi
 
+	ewarn
+	ewarn "The $RC_SVCNAME script is deprecated and will be"
+	ewarn "removed in the future."
+	ewarn "Please use the net.* scripts to manage your network interfaces."
+	ewarn
+
 	einfo "Starting network"
 	routeflush
 	if [ "$RC_UNAME" = "Linux" ]; then
diff --git a/init.d/staticroute.in b/init.d/staticroute.in
index 213dddf..294f890 100644
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -93,6 +93,11 @@ do_routes()
 
 start()
 {
+	ewarn
+	ewarn "The $RC_SVCNAME script is deprecated and will be"
+	ewarn "removed in the future."
+	ewarn "Please use the net.* scripts to manage your network interfaces."
+	ewarn
 	do_routes "Adding" "add"
 }
 
-- 
cgit v1.2.3