aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1999-08-27 22:15:15 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1999-08-27 22:15:15 +0000
commit50b14091b71a7932d512009d783e1f657f800fc6 (patch)
tree10e8fb89a316b188d56fe95d1a63b5f761c5e286 /etc
parentb3bc7a4bb067856d1156b3b2cdb171cb50ac2a56 (diff)
downloadsrc-50b14091b71a7932d512009d783e1f657f800fc6.tar.gz
src-50b14091b71a7932d512009d783e1f657f800fc6.zip
Catch an extra X on DHCP.
Spotted by the eagle eyes of: Pierre DAVID <Pierre.David@prism.uvsq.fr>
Notes
Notes: svn path=/head/; revision=50470
Diffstat (limited to 'etc')
-rw-r--r--etc/network.subr4
-rw-r--r--etc/rc.d/netoptions4
-rw-r--r--etc/rc.d/network14
-rw-r--r--etc/rc.d/network24
-rw-r--r--etc/rc.d/network34
-rw-r--r--etc/rc.d/routing4
-rw-r--r--etc/rc.network4
7 files changed, 14 insertions, 14 deletions
diff --git a/etc/network.subr b/etc/network.subr
index b14e7ca1a484..40cfcad87f27 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
+# $Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@@ -64,7 +64,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}
if [ -n "${ifconfig_args}" ] ; then
# See if we are using DHCP
- if [ "${ifconfig_args}" = "XDHCP" ]; then
+ if [ "${ifconfig_args}" = "DHCP" ]; then
${dhcp_program} ${dhcp_flags} ${ifn}
else
ifconfig ${ifn} ${ifconfig_args}
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index b14e7ca1a484..40cfcad87f27 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
+# $Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@@ -64,7 +64,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}
if [ -n "${ifconfig_args}" ] ; then
# See if we are using DHCP
- if [ "${ifconfig_args}" = "XDHCP" ]; then
+ if [ "${ifconfig_args}" = "DHCP" ]; then
${dhcp_program} ${dhcp_flags} ${ifn}
else
ifconfig ${ifn} ${ifconfig_args}
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index b14e7ca1a484..40cfcad87f27 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
+# $Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@@ -64,7 +64,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}
if [ -n "${ifconfig_args}" ] ; then
# See if we are using DHCP
- if [ "${ifconfig_args}" = "XDHCP" ]; then
+ if [ "${ifconfig_args}" = "DHCP" ]; then
${dhcp_program} ${dhcp_flags} ${ifn}
else
ifconfig ${ifn} ${ifconfig_args}
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index b14e7ca1a484..40cfcad87f27 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
+# $Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@@ -64,7 +64,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}
if [ -n "${ifconfig_args}" ] ; then
# See if we are using DHCP
- if [ "${ifconfig_args}" = "XDHCP" ]; then
+ if [ "${ifconfig_args}" = "DHCP" ]; then
${dhcp_program} ${dhcp_flags} ${ifn}
else
ifconfig ${ifn} ${ifconfig_args}
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index b14e7ca1a484..40cfcad87f27 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
+# $Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@@ -64,7 +64,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}
if [ -n "${ifconfig_args}" ] ; then
# See if we are using DHCP
- if [ "${ifconfig_args}" = "XDHCP" ]; then
+ if [ "${ifconfig_args}" = "DHCP" ]; then
${dhcp_program} ${dhcp_flags} ${ifn}
else
ifconfig ${ifn} ${ifconfig_args}
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index b14e7ca1a484..40cfcad87f27 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
+# $Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@@ -64,7 +64,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}
if [ -n "${ifconfig_args}" ] ; then
# See if we are using DHCP
- if [ "${ifconfig_args}" = "XDHCP" ]; then
+ if [ "${ifconfig_args}" = "DHCP" ]; then
${dhcp_program} ${dhcp_flags} ${ifn}
else
ifconfig ${ifn} ${ifconfig_args}
diff --git a/etc/rc.network b/etc/rc.network
index b14e7ca1a484..40cfcad87f27 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $Id: rc.network,v 1.55 1999/08/22 23:26:03 brian Exp $
+# $Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@@ -64,7 +64,7 @@ network_pass1() {
eval ifconfig_args=\$ifconfig_${ifn}
if [ -n "${ifconfig_args}" ] ; then
# See if we are using DHCP
- if [ "${ifconfig_args}" = "XDHCP" ]; then
+ if [ "${ifconfig_args}" = "DHCP" ]; then
${dhcp_program} ${dhcp_flags} ${ifn}
else
ifconfig ${ifn} ${ifconfig_args}