From 3b51c999a4127262c5bac34974cb1dc289858668 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Mon, 1 Apr 2002 18:33:45 +0000
Subject: The good news is that my initial PR was correct... the bad news is
 that I was apparently smoking something when I committed the last fix,
 because as ume was kindly enough to set me straight on, amd *will* start with
 no arguments at all, as long as there is an /etc/amd.conf file for it to
 read. What it won't do is start with *just* -p.

In any case, now it's fixed.
---
 etc/network.subr    | 6 +++++-
 etc/rc.d/netoptions | 6 +++++-
 etc/rc.d/network1   | 6 +++++-
 etc/rc.d/network2   | 6 +++++-
 etc/rc.d/network3   | 6 +++++-
 etc/rc.d/routing    | 6 +++++-
 etc/rc.network      | 6 +++++-
 7 files changed, 35 insertions(+), 7 deletions(-)

(limited to 'etc')

diff --git a/etc/network.subr b/etc/network.subr
index eabdd0b..8d779ea 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -757,8 +757,12 @@ network_pass3() {
 
 					case "${amd_flags}" in
 					'')
-						echo ''
+						if [ -r /etc/amd.conf ]; then
+							amd &
+						else
+							echo ''
 			echo 'Warning: amd will not load without arguments'
+						fi
 						;;
 					*)
 						amd -p ${amd_flags} \
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index eabdd0b..8d779ea 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -757,8 +757,12 @@ network_pass3() {
 
 					case "${amd_flags}" in
 					'')
-						echo ''
+						if [ -r /etc/amd.conf ]; then
+							amd &
+						else
+							echo ''
 			echo 'Warning: amd will not load without arguments'
+						fi
 						;;
 					*)
 						amd -p ${amd_flags} \
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index eabdd0b..8d779ea 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -757,8 +757,12 @@ network_pass3() {
 
 					case "${amd_flags}" in
 					'')
-						echo ''
+						if [ -r /etc/amd.conf ]; then
+							amd &
+						else
+							echo ''
 			echo 'Warning: amd will not load without arguments'
+						fi
 						;;
 					*)
 						amd -p ${amd_flags} \
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index eabdd0b..8d779ea 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -757,8 +757,12 @@ network_pass3() {
 
 					case "${amd_flags}" in
 					'')
-						echo ''
+						if [ -r /etc/amd.conf ]; then
+							amd &
+						else
+							echo ''
 			echo 'Warning: amd will not load without arguments'
+						fi
 						;;
 					*)
 						amd -p ${amd_flags} \
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index eabdd0b..8d779ea 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -757,8 +757,12 @@ network_pass3() {
 
 					case "${amd_flags}" in
 					'')
-						echo ''
+						if [ -r /etc/amd.conf ]; then
+							amd &
+						else
+							echo ''
 			echo 'Warning: amd will not load without arguments'
+						fi
 						;;
 					*)
 						amd -p ${amd_flags} \
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index eabdd0b..8d779ea 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -757,8 +757,12 @@ network_pass3() {
 
 					case "${amd_flags}" in
 					'')
-						echo ''
+						if [ -r /etc/amd.conf ]; then
+							amd &
+						else
+							echo ''
 			echo 'Warning: amd will not load without arguments'
+						fi
 						;;
 					*)
 						amd -p ${amd_flags} \
diff --git a/etc/rc.network b/etc/rc.network
index eabdd0b..8d779ea 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -757,8 +757,12 @@ network_pass3() {
 
 					case "${amd_flags}" in
 					'')
-						echo ''
+						if [ -r /etc/amd.conf ]; then
+							amd &
+						else
+							echo ''
 			echo 'Warning: amd will not load without arguments'
+						fi
 						;;
 					*)
 						amd -p ${amd_flags} \
-- 
cgit v1.1