r3933 - in trunk/bootscripts: . lfs/sysconfig/network-devices/services

nathan at linuxfromscratch.org nathan at linuxfromscratch.org
Tue Jul 13 17:57:05 PDT 2004


Author: nathan
Date: 2004-07-13 18:57:03 -0600 (Tue, 13 Jul 2004)
New Revision: 3933

Modified:
   trunk/bootscripts/CHANGELOG
   trunk/bootscripts/README
   trunk/bootscripts/lfs/sysconfig/network-devices/services/ipv4-static
Log:
Added Kevin P. Fleming's PEER patch

Modified: trunk/bootscripts/CHANGELOG
===================================================================
--- trunk/bootscripts/CHANGELOG	2004-07-13 19:53:55 UTC (rev 3932)
+++ trunk/bootscripts/CHANGELOG	2004-07-14 00:57:03 UTC (rev 3933)
@@ -1,3 +1,11 @@
+n/a - July 13, 2004
+
+	* Added the PEER variable to the ifconfig.*/* file, done by Kevin P. Fleming
+
+2.2.1 - July 12, 2004
+
+	* Tagged as 2.2.1
+
 n/a - July 12, 2004
 
 	* Hotplug was moved from rcsysinit.d to rc{1,2,3,4,5} to help bring up/down

Modified: trunk/bootscripts/README
===================================================================
--- trunk/bootscripts/README	2004-07-13 19:53:55 UTC (rev 3932)
+++ trunk/bootscripts/README	2004-07-14 00:57:03 UTC (rev 3933)
@@ -30,6 +30,7 @@
 		- IP: static IP Address
 		- GATEWAY: Specifies the IP Address of the gateway server
 		- PREFIX: CIDR prefix of IP Address, defaults to 24 if not set
+		- PEER: IP Address of peer (for point-to-point connections and tunnels)
 		- BROADCAST: broadcast address
 		ipv4-static-route:
 		- TYPE: network (default type if not specified), default, host or

Modified: trunk/bootscripts/lfs/sysconfig/network-devices/services/ipv4-static
===================================================================
--- trunk/bootscripts/lfs/sysconfig/network-devices/services/ipv4-static	2004-07-13 19:53:55 UTC (rev 3932)
+++ trunk/bootscripts/lfs/sysconfig/network-devices/services/ipv4-static	2004-07-14 00:57:03 UTC (rev 3933)
@@ -14,14 +14,20 @@
 	exit 1
 fi
 
-if [ -z "$PREFIX" ]; then
+if [ -z "$PREFIX" -a -z "$PEER" ]; then
 	echo -n "PREFIX variable missing from $IFCONFIG, "
 	echo    "assuming 24"
 	PREFIX=24
+	args="$args $IP/$PREFIX"
+elif [ -n "$PREFIX" -a -n "$PEER" ]; then
+	echo "PREFIX and PEER both specified in $IFCONFIG, cannot continue"
+	exit 1
+elif [ -n "$PREFIX" ]; then
+	args="$args $IP/$PREFIX"
+elif [ -n "$PEER" ]; then
+	args="$args $IP peer $PEER"
 fi
 
-args="$args $IP/$PREFIX"
-
 if [ -n "$BROADCAST" ]; then
 	args="$args broadcast $BROADCAST"
 fi




More information about the lfs-book mailing list