diff options
| -rw-r--r-- | ObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 1 | ||||
| -rwxr-xr-x | etc/rc.d/NETWORKING | 2 | ||||
| -rwxr-xr-x | etc/rc.d/mroute6d | 18 |
4 files changed, 3 insertions, 20 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b4cf9947bc96e..a90e0f2b93bb8 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20160423: remove mroute6d +OLD_FILES+=etc/rc.d/mroute6d # 20160419: rename units.lib -> definitions.units OLD_FILES+=usr/share/misc/units.lib # 20160419: remove Big5HKSCS locales diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index cd9405f768f87..0784c3ad38d7e 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -72,7 +72,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - mroute6d \ msgs \ natd \ netif \ diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING index 92ba05df5d0c8..5d0d0e50bcff0 100755 --- a/etc/rc.d/NETWORKING +++ b/etc/rc.d/NETWORKING @@ -5,7 +5,7 @@ # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netwait netoptions routing ppp ipfw stf -# REQUIRE: defaultroute routed route6d mroute6d resolv bridge +# REQUIRE: defaultroute routed route6d resolv bridge # REQUIRE: static_arp static_ndp # This is a dummy dependency, for services which require networking diff --git a/etc/rc.d/mroute6d b/etc/rc.d/mroute6d deleted file mode 100755 index 1eb6eb417e35a..0000000000000 --- a/etc/rc.d/mroute6d +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mroute6d -# REQUIRE: netif routing -# BEFORE: NETWORKING -# KEYWORD: nojail - -. /etc/rc.subr - -name="mroute6d" -rcvar="mroute6d_enable" -command="/usr/local/sbin/pim6dd" - -load_rc_config $name -run_rc_command "$1" |