diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2013-08-05 19:38:44 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2013-08-05 19:38:44 +0000 |
| commit | 0c5d0027b8fbd8db1b866f69d520f7588e7e1098 (patch) | |
| tree | fa83c17691dce6c9bc51aa3dd74ef5e84799cc1d /bootscripts | |
| parent | 466dae654d70a9b4db77c5efdc33ae845f0700d1 (diff) | |
Update to linux-3.10.5
Fix bootscript ipv4-static-route
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10310 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/ChangeLog | 3 | ||||
| -rwxr-xr-x | bootscripts/lfs/lib/services/ipv4-static-route | 12 | ||||
| -rw-r--r-- | bootscripts/lfs/sbin/ifup.8 | 9 |
3 files changed, 19 insertions, 5 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index c6569f092..b28854c3c 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,6 @@ +2013-08-05 Bruce Dubbs <bdubbs@linuxfromscratch.org> + * Use STATIC_GATEWAY for ipv4-static-route purposes + 2013-05-15 Bruce Dubbs <bdubbs@linuxfromscratch.org> * Remove unneeded options and commands from mountfs and mountvirtfs when mtab is a symlink to /proc/self/mounts diff --git a/bootscripts/lfs/lib/services/ipv4-static-route b/bootscripts/lfs/lib/services/ipv4-static-route index c4d433d2a..293ca44a5 100755 --- a/bootscripts/lfs/lib/services/ipv4-static-route +++ b/bootscripts/lfs/lib/services/ipv4-static-route @@ -43,6 +43,12 @@ case "${TYPE}" in ;; esac +if [ -n "${GATEWAY}" ]; then + MSG="The GATEWAY variable cannot be set in ${IFCONFIG} for static routes.\n" + log_failure_msg "$MSG Use STATIC_GATEWAY only, cannot continue" + exit 1 +fi + if [ -n "${need_ip}" ]; then if [ -z "${IP}" ]; then log_failure_msg "IP variable missing from ${IFCONFIG}, cannot continue." @@ -59,11 +65,11 @@ if [ -n "${need_ip}" ]; then fi if [ -n "${need_gateway}" ]; then - if [ -z "${GATEWAY}" ]; then - log_failure_msg "GATEWAY variable missing from ${IFCONFIG}, cannot continue." + if [ -z "${STATIC_GATEWAY}" ]; then + log_failure_msg "STATIC_GATEWAY variable missing from ${IFCONFIG}, cannot continue." exit 1 fi - args="${args} via ${GATEWAY}" + args="${args} via ${STATIC_GATEWAY}" fi if [ -n "${SOURCE}" ]; then diff --git a/bootscripts/lfs/sbin/ifup.8 b/bootscripts/lfs/sbin/ifup.8 index 8ed0d9586..7c3a007d6 100644 --- a/bootscripts/lfs/sbin/ifup.8 +++ b/bootscripts/lfs/sbin/ifup.8 @@ -99,7 +99,12 @@ NOTES the destination IP address is not in a static route or on a local network, e.g., 192.168.1.1. For secondary IP addresses on an interface, this - parameter should not be specified. + parameter should not be specified. If the service + is ipv4-static-route, this parameter must NOT + be set. + + STATIC_GATEWAY - The default IP address to use for routing + when setting a static routing address. INTERFACE_COMPONENTS - A list of component interfaces only needed for a compound device such as a bridge. @@ -132,7 +137,7 @@ NOTES PREFIX - The prefix for the associated IP address. - GATEWAY - The IP address for a network route. + STATIC_GATEWAY - The IP address for a network route. SOURCE - The source IP address to prefer when sending to the destinations covered by the specified |