Add pppoed startup options

8 files changed, 74 insertions, 0 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 1d82358..9b685b4 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -114,6 +114,10 @@ rarpd_enable="NO"		# Run rarpd (or NO).
 rarpd_flags=""			# Flags to rarpd.
 xtend_enable="NO"		# Run the X-10 power controller daemon.
 xtend_flags=""			# Flags to xtend (if enabled).
+pppoed_enable="NO"		# Run the PPP over Ethernet daemon.
+pppoed_provider="*"		# Provider and ppp(8) config file entry.
+pppoed_flags="-P /var/run/pppoed.pid"	# Flags to pppoed (if enabled).
+pppoed_interface="fxp0"		# The interface that pppoed runs on.
 
 ### Network Time Services options: ###
 timed_enable="NO"		# Run the time daemon (or NO).
diff --git a/etc/network.subr b/etc/network.subr
index e98b40a..75ee8ca 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -578,6 +578,16 @@ network_pass3() {
 		;;
 	esac
 
+	case ${pppoed_enable} in
+	[Yy][Ee][Ss])
+		if [ -n "$pppoed_provider ]; then
+			pppoed_flags="${pppoed_flags} -p ${pppoed_provider}"
+		fi
+		echo -n ' pppoed';
+		/usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface}
+		;;
+	esac
+
 	echo '.'
 	network_pass3_done=YES
 }
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index e98b40a..75ee8ca 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -578,6 +578,16 @@ network_pass3() {
 		;;
 	esac
 
+	case ${pppoed_enable} in
+	[Yy][Ee][Ss])
+		if [ -n "$pppoed_provider ]; then
+			pppoed_flags="${pppoed_flags} -p ${pppoed_provider}"
+		fi
+		echo -n ' pppoed';
+		/usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface}
+		;;
+	esac
+
 	echo '.'
 	network_pass3_done=YES
 }
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index e98b40a..75ee8ca 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -578,6 +578,16 @@ network_pass3() {
 		;;
 	esac
 
+	case ${pppoed_enable} in
+	[Yy][Ee][Ss])
+		if [ -n "$pppoed_provider ]; then
+			pppoed_flags="${pppoed_flags} -p ${pppoed_provider}"
+		fi
+		echo -n ' pppoed';
+		/usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface}
+		;;
+	esac
+
 	echo '.'
 	network_pass3_done=YES
 }
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index e98b40a..75ee8ca 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -578,6 +578,16 @@ network_pass3() {
 		;;
 	esac
 
+	case ${pppoed_enable} in
+	[Yy][Ee][Ss])
+		if [ -n "$pppoed_provider ]; then
+			pppoed_flags="${pppoed_flags} -p ${pppoed_provider}"
+		fi
+		echo -n ' pppoed';
+		/usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface}
+		;;
+	esac
+
 	echo '.'
 	network_pass3_done=YES
 }
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index e98b40a..75ee8ca 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -578,6 +578,16 @@ network_pass3() {
 		;;
 	esac
 
+	case ${pppoed_enable} in
+	[Yy][Ee][Ss])
+		if [ -n "$pppoed_provider ]; then
+			pppoed_flags="${pppoed_flags} -p ${pppoed_provider}"
+		fi
+		echo -n ' pppoed';
+		/usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface}
+		;;
+	esac
+
 	echo '.'
 	network_pass3_done=YES
 }
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index e98b40a..75ee8ca 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -578,6 +578,16 @@ network_pass3() {
 		;;
 	esac
 
+	case ${pppoed_enable} in
+	[Yy][Ee][Ss])
+		if [ -n "$pppoed_provider ]; then
+			pppoed_flags="${pppoed_flags} -p ${pppoed_provider}"
+		fi
+		echo -n ' pppoed';
+		/usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface}
+		;;
+	esac
+
 	echo '.'
 	network_pass3_done=YES
 }
diff --git a/etc/rc.network b/etc/rc.network
index e98b40a..75ee8ca 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -578,6 +578,16 @@ network_pass3() {
 		;;
 	esac
 
+	case ${pppoed_enable} in
+	[Yy][Ee][Ss])
+		if [ -n "$pppoed_provider ]; then
+			pppoed_flags="${pppoed_flags} -p ${pppoed_provider}"
+		fi
+		echo -n ' pppoed';
+		/usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface}
+		;;
+	esac
+
 	echo '.'
 	network_pass3_done=YES
 }