aboutsummaryrefslogtreecommitdiff
path: root/init.d
diff options
context:
space:
mode:
Diffstat (limited to 'init.d')
-rw-r--r--init.d/Makefile14
-rw-r--r--init.d/network.in6
-rw-r--r--init.d/staticroute.in5
3 files changed, 10 insertions, 15 deletions
diff --git a/init.d/Makefile b/init.d/Makefile
index 863864f2..82c73afb 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -4,9 +4,15 @@ SRCS= bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
swclock.in sysctl.in urandom.in ${SRCS-${OS}}
BIN= ${OBJS}
-INSTALLAFTER= _installafter_net.lo
-CLEANFILES+= net.lo
-TARGETS+= net.lo
+# 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}
MK= ../mk
include ${MK}/os.mk
@@ -39,4 +45,4 @@ include ${MK}/scripts.mk
_installafter_: realinstall
_installafter_net.lo: realinstall
- ${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO-${OS}}
+ ${INSTALL} -m ${BINMODE} net.lo ${DESTDIR}/${INITDIR}/${NET_LO}
diff --git a/init.d/network.in b/init.d/network.in
index d65a6a9d..20d46f4a 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -219,12 +219,6 @@ 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 7ace6591..91b61a40 100644
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -93,11 +93,6 @@ 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"
}