mirror of
https://abf.rosa.ru/djam/ppp.git
synced 2025-02-22 17:42:55 +00:00
Move ppp initscripts to ppp package
This commit is contained in:
law
parent
d052dd5b05
commit
b4701b2380
10 changed files with 819 additions and 4 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,4 +1,5 @@
|
|||
sources:
|
||||
ppp-2.4.1-mppe-crypto.tar.bz2: 9652e5a21131239f6e8499d4dbc448a9eeee132f
|
||||
ppp-dhcpc.tar.bz2: 8b49c9b8ccde83f69c4b0c9cae6454cdba0845ca
|
||||
ppp-2.4.7.tar.gz: 808b023172ea7189bc0d49935bf37a5382a1fe13
|
||||
ppp-dhcpc.tar.bz2: 8b49c9b8ccde83f69c4b0c9cae6454cdba0845ca
|
||||
ppp-watch.tar.xz: 74b6db205dc46fc179a2a3bc3d726ddfeb03c801
|
||||
|
|
|
|||
51
ifdown-ppp
Executable file
51
ifdown-ppp
Executable file
|
|
@ -0,0 +1,51 @@
|
|||
#! /bin/bash
|
||||
|
||||
cd /etc/sysconfig/network-scripts
|
||||
. ./network-functions
|
||||
|
||||
CONFIG=$1
|
||||
source_config
|
||||
|
||||
if [ "$TYPE" = "xDSL" ] && [ -x /usr/sbin/adsl-stop ] ; then
|
||||
adsl-stop /etc/sysconfig/network-scripts/$CONFIG
|
||||
exit $?
|
||||
fi
|
||||
|
||||
CONFIG=${CONFIG##ifcfg-}
|
||||
|
||||
if [ "${DEMAND}" = "yes" ] && [ -f /var/run/ppp-${CONFIG}.pid ] ; then
|
||||
PID=$(head -1 /var/run/ppp-${CONFIG}.pid)
|
||||
kill -TERM ${PID}
|
||||
sleep 2
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
sleep 5
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
kill -TERM ${PID}
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
exit 1
|
||||
fi
|
||||
|
||||
file=/var/run/pppwatch-${DEVICE}.pid
|
||||
|
||||
if [ ! -f $file ]; then
|
||||
# ppp isn't running, or we didn't start it
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PID=$(cat $file)
|
||||
[ -n "${PID}" ] || exit 1
|
||||
|
||||
kill -TERM ${PID} > /dev/null 2>&1
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
sleep 2
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
sleep 5
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
sleep 10
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
|
||||
# killing ppp-watch twice in a row causes it to send a SIGKILL to pppd pgrp
|
||||
kill -TERM ${PID} > /dev/null 2>&1
|
||||
[ ! -d /proc/${PID} ] && exit 0
|
||||
|
||||
exit 1
|
||||
157
ifup-ppp
Executable file
157
ifup-ppp
Executable file
|
|
@ -0,0 +1,157 @@
|
|||
#! /bin/bash
|
||||
|
||||
. /etc/init.d/functions
|
||||
|
||||
cd /etc/sysconfig/network-scripts
|
||||
. ./network-functions
|
||||
|
||||
# ifup-post for PPP is handled through /etc/ppp/ip-up
|
||||
if [ "${1}" = daemon ] ; then
|
||||
# we've been called from ppp-watch, so don't invoke it for persistence
|
||||
shift
|
||||
else
|
||||
# just in case a full path to the configuration file is passed in
|
||||
CONFIG=${1##*/} # CONFIG=$(basename $1)
|
||||
[ -f "${CONFIG}" ] || CONFIG=ifcfg-${1}
|
||||
source_config
|
||||
# don't start ppp-watch by xDSL
|
||||
if [ "${DEMAND}" != yes -a "$TYPE" != "xDSL" ] ; then
|
||||
# let ppp-watch do the right thing
|
||||
exec /sbin/ppp-watch "${CONFIG##ifcfg-}" "$2"
|
||||
fi
|
||||
fi
|
||||
|
||||
CONFIG=$1
|
||||
[ -f "${CONFIG}" ] || CONFIG=ifcfg-${1}
|
||||
source_config
|
||||
|
||||
if [ -z "${DISCONNECTTIMEOUT}" ]; then
|
||||
DISCONNECTTIMEOUT=2
|
||||
fi
|
||||
|
||||
if [ -z "${RETRYTIMEOUT}" ]; then
|
||||
RETRYTIMEOUT=30
|
||||
fi
|
||||
|
||||
if [ -z "${IDLETIMEOUT}" ]; then
|
||||
IDLETIMEOUT=600
|
||||
fi
|
||||
|
||||
if [ "${2}" = "boot" -a "${ONBOOT}" = "no" ]; then
|
||||
exit
|
||||
fi
|
||||
|
||||
[ -x /usr/sbin/pppd ] || {
|
||||
gprintf "pppd does not exist or is not executable\n"
|
||||
gprintf "ifup-ppp for %s exiting\n" ${DEVICE}
|
||||
/usr/bin/logger -p daemon.info -t ifup-ppp \
|
||||
"pppd does not exist or is not executable for %s" ${DEVICE}
|
||||
exit 1
|
||||
}
|
||||
|
||||
# check that xDSL connection
|
||||
if [ "$TYPE" = "xDSL" ] ; then
|
||||
if [ -x /usr/sbin/adsl-start ] ; then
|
||||
adsl-start /etc/sysconfig/network-scripts/$CONFIG
|
||||
exit $?
|
||||
else
|
||||
/usr/bin/logger -p daemon.info -t ifup-ppp \
|
||||
"adsl-start does not exist or is not executable for %s" ${DEVICE}
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
PEERCONF=/etc/ppp/peers/${DEVNAME}
|
||||
|
||||
if [ "${DEBUG}" = "yes" ]; then
|
||||
CHATDBG="-v"
|
||||
fi
|
||||
|
||||
if [ ! -f ${PEERCONF} ]; then
|
||||
if [ -z "${WVDIALSECT}" ] ; then
|
||||
CHATSCRIPT=/etc/sysconfig/network-scripts/chat-${DEVNAME}
|
||||
[ -f ${CHATSCRIPT} ] || {
|
||||
gprintf "/etc/sysconfig/network-scripts/chat-%s does not exist\n" ${DEVNAME}
|
||||
gprintf "ifup-ppp for %s exiting\n" ${DEVNAME}
|
||||
/usr/bin/logger -p daemon.info -t ifup-ppp \
|
||||
"/etc/sysconfig/network-scripts/chat-%s does not exist for %s" ${DEVNAME} ${DEVICE}
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
/usr/bin/logger -s -p daemon.notice -t ifup-ppp \
|
||||
"Setting up a new %s config file" ${PEERCONF}
|
||||
if [ -f /etc/ppp/peers/${DEVICE} ]; then
|
||||
cp -f /etc/ppp/peers/${DEVICE} ${PEERCONF}
|
||||
else
|
||||
touch ${PEERCONF}
|
||||
fi
|
||||
if [ "${WVDIALSECT}" ]; then
|
||||
echo "connect \"/usr/bin/wvdial --remotename ${DEVNAME} --chat '${WVDIALSECT}'\"" >> ${PEERCONF}
|
||||
else
|
||||
echo "connect \"/usr/sbin/chat ${CHATDBG} -f ${CHATSCRIPT}\"" >> ${PEERCONF}
|
||||
fi
|
||||
fi
|
||||
|
||||
opts="lock"
|
||||
if [ "${HARDFLOWCTL}" != no ] ; then
|
||||
opts="$opts modem crtscts"
|
||||
fi
|
||||
if [ "${ESCAPECHARS}" != yes ] ; then
|
||||
opts="$opts asyncmap 00000000"
|
||||
fi
|
||||
if [ "${DEFROUTE}" != no ] ; then
|
||||
# pppd will no longer delete an existing default route
|
||||
# so we have to help it out a little here.
|
||||
DEFRT=$(ip route list match 0.0.0.0/0)
|
||||
[ -n "${DEFRT}" ] && echo "$DEFRT" > /etc/default-routes
|
||||
echo "$DEFRT" | while read spec; do
|
||||
ip route del $spec;
|
||||
done
|
||||
opts="$opts defaultroute"
|
||||
fi
|
||||
if [ "${PEERDNS}" != no ] ; then
|
||||
cp -f /etc/resolv.conf /etc/resolv.conf.save
|
||||
opts="$opts usepeerdns"
|
||||
fi
|
||||
if [ -n "${MRU}" ] ; then
|
||||
opts="$opts mru ${MRU}"
|
||||
fi
|
||||
if [ -n "${MTU}" ] ; then
|
||||
opts="$opts mtu ${MTU}"
|
||||
fi
|
||||
if [ -n "${IPADDR}${REMIP}" ] ; then
|
||||
# if either IP address is set, the following will work.
|
||||
opts="$opts ${IPADDR}:${REMIP}"
|
||||
fi
|
||||
if [ -n "${PAPNAME}" ] ; then
|
||||
opts="$opts user ${PAPNAME} remotename ${DEVNAME}"
|
||||
fi
|
||||
if [ "${DEBUG}" = yes ] ; then
|
||||
opts="$opts debug"
|
||||
fi
|
||||
|
||||
if [ ${DEMAND} = yes ] ; then
|
||||
opts="$opts demand ktune idle ${IDLETIMEOUT} holdoff ${RETRYTIMEOUT}"
|
||||
exec=
|
||||
else
|
||||
opts="$opts nodetach"
|
||||
exec=exec
|
||||
fi
|
||||
|
||||
/usr/bin/logger -p daemon.info -t ifup-ppp \
|
||||
"pppd started for %s on %s at %s" ${DEVNAME} ${MODEMPORT} ${LINESPEED}
|
||||
|
||||
$exec pppd $opts ${MODEMPORT} ${LINESPEED} \
|
||||
ipparam ${DEVNAME} linkname ${DEVNAME} call ${DEVNAME}\
|
||||
noauth \
|
||||
${PPPOPTIONS} || exit
|
||||
|
||||
if [ "${DEMAND}" = "yes" ] ; then
|
||||
# pppd is a tad slow to write the pid-file.
|
||||
sleep 2
|
||||
if [ -f /var/run/ppp-${DEVNAME}.pid ] ; then
|
||||
REALDEVICE=$(tail -1 /var/run/ppp-${DEVNAME}.pid)
|
||||
/etc/sysconfig/network-scripts/ifup-routes ${REALDEVICE} ${DEVNAME}
|
||||
fi
|
||||
fi
|
||||
|
||||
38
ip-down
Normal file
38
ip-down
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/bash
|
||||
# This file should not be modified -- make local changes to
|
||||
# /etc/ppp/ip-down.local instead
|
||||
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
export PATH
|
||||
|
||||
LOGDEVICE=$6
|
||||
REALDEVICE=$1
|
||||
|
||||
export PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
|
||||
cp -f /etc/resolv.conf /etc/resolv.conf.tmp
|
||||
fgrep -v "# ppp temp entry" /etc/resolv.conf.tmp > /etc/resolv.conf
|
||||
chmod 0644 /etc/resolv.conf
|
||||
rm -f /etc/resolv.conf.tmp
|
||||
|
||||
/etc/ppp/ip-down.ipv6to4 ${LOGDEVICE}
|
||||
|
||||
[ -x /etc/ppp/ip-down.local ] && /etc/ppp/ip-down.local "$@"
|
||||
|
||||
# These variables are for the use of the scripts run by run-parts
|
||||
PPP_IFACE="$1"
|
||||
PPP_TTY="$2"
|
||||
PPP_SPEED="$3"
|
||||
PPP_LOCAL="$4"
|
||||
PPP_REMOTE="$5"
|
||||
PPP_IPPARAM="$6"
|
||||
export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
|
||||
|
||||
if [ -d /etc/ppp/ip-down.d/ -a -x /usr/bin/run-parts ]; then
|
||||
/usr/bin/run-parts /etc/ppp/ip-down.d/
|
||||
fi
|
||||
|
||||
/etc/sysconfig/network-scripts/ifdown-post --realdevice ${REALDEVICE} \
|
||||
ifcfg-${LOGDEVICE}
|
||||
|
||||
exit 0
|
||||
114
ip-down.ipv6to4
Normal file
114
ip-down.ipv6to4
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# ip-down.ipv6to4
|
||||
#
|
||||
#
|
||||
# Taken from:
|
||||
# (P) & (C) 2000-2005 by Peter Bieringer <pb@bieringer.de>
|
||||
#
|
||||
# You will find more information on the initscripts-ipv6 homepage at
|
||||
# http://www.deepspace6.net/projects/initscripts-ipv6.html
|
||||
#
|
||||
# Version 2005-09-22
|
||||
#
|
||||
# Calling parameters:
|
||||
# $1: interface name
|
||||
#
|
||||
# Called (mostly) by /etc/ppp/ip-down.local
|
||||
# like: /etc/ppp/ip-down.ipv6to4 $1 >>/var/log/ppp-ipv6to4.log 2>&1
|
||||
#
|
||||
# Note: this script will *check* whether the existing 6to4 tunnel
|
||||
# was set before by using "ip-up.ipv6to4" comparing IPv4 address
|
||||
# of device with the generated 6to4 prefix
|
||||
#
|
||||
# Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
|
||||
# IPV6TO4INIT=yes|no: controls configuration
|
||||
# IPV6TO4_ROUTING="<device>-<suffix>/<prefix length> ...": information to setup additional interfaces
|
||||
#
|
||||
# IPV6_CONTROL_RADVD=yes|no: controls radvd triggering
|
||||
# IPV6_RADVD_PIDFILE=<file>: PID file of radvd for sending signals, default is "/var/run/radvd/radvd.pid"
|
||||
# IPV6_RADVD_TRIGGER_ACTION=startstop|reload|restart|SIGHUP: how to trigger radvd (optional, default is SIGHUP)
|
||||
#
|
||||
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo $"Argument 1 is empty but should contain interface name - skip IPv6to4 initialization"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Get global network configuration
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Source IPv4 helper functions
|
||||
cd /etc/sysconfig/network-scripts
|
||||
. ./network-functions
|
||||
|
||||
CONFIG=$1
|
||||
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
|
||||
source_config
|
||||
|
||||
# IPv6 don't need aliases anymore, config is skipped
|
||||
REALDEVICE=${DEVICE%%:*}
|
||||
[ "$DEVICE" != "$REALDEVICE" ] && exit 0
|
||||
|
||||
if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
. /etc/sysconfig/network-scripts/network-functions-ipv6
|
||||
|
||||
|
||||
# Run basic IPv6 test, if not ok, skip IPv6 initialization
|
||||
ipv6_test testonly || exit 0
|
||||
|
||||
# Test status of ppp device
|
||||
ipv6_test_device_status $DEVICE
|
||||
if [ $? != 0 -a $? != 11 ]; then
|
||||
# device doesn't exist or other problem occurs
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Test status of tun6to4 device
|
||||
ipv6_test_device_status tun6to4
|
||||
if [ $? = 0 -o $? = 11 ]; then
|
||||
# Device exists
|
||||
valid6to4config="yes"
|
||||
|
||||
# Get IPv4 address from interface
|
||||
ipv4addr="$(ipv6_get_ipv4addr_of_device $DEVICE)"
|
||||
if [ -z "$ipv4addr" ]; then
|
||||
# Has no IPv4 address
|
||||
valid6to4config="no"
|
||||
fi
|
||||
|
||||
# Get local IPv4 address of dedicated tunnel
|
||||
ipv4addr6to4local="$(ipv6_get_ipv4addr_of_tunnel tun6to4 local)"
|
||||
|
||||
# IPv6to4 not enabled on this interface?
|
||||
if [ $IPV6TO4INIT != "yes" ]; then
|
||||
# Check against configured 6to4 tunnel to see if this interface was regardless used before
|
||||
if [ "$ipv4addr" != "$ipv4addr6to4local" ]; then
|
||||
# IPv4 address of interface does't match local tunnel address, interface was not used for current 6to4 setup
|
||||
valid6to4config="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if [ "$valid6to4config" = "yes" ]; then
|
||||
if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then
|
||||
# Control running radvd
|
||||
ipv6_trigger_radvd down "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE
|
||||
fi
|
||||
|
||||
if [ -n "$IPV6TO4_ROUTING" ]; then
|
||||
# Delete routes to local networks
|
||||
for devsuf in $IPV6TO4_ROUTING; do
|
||||
dev="${devsuf%%-*}"
|
||||
ipv6_cleanup_6to4_device $dev
|
||||
done
|
||||
fi
|
||||
|
||||
# Delete all configured 6to4 address
|
||||
ipv6_cleanup_6to4_tunnels tun6to4
|
||||
fi
|
||||
39
ip-up
Normal file
39
ip-up
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
#!/bin/bash
|
||||
# This file should not be modified -- make local changes to
|
||||
# /etc/ppp/ip-up.local or put scripts in /etc/ppp/ip-up.d instead
|
||||
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
export PATH
|
||||
|
||||
LOGDEVICE=$6
|
||||
REALDEVICE=$1
|
||||
|
||||
if [ -f /etc/sysconfig/network-scripts/ifcfg-${LOGDEVICE} ]; then
|
||||
/etc/sysconfig/network-scripts/ifup-post --realdevice ${REALDEVICE} ifcfg-${LOGDEVICE}
|
||||
else
|
||||
[ -n "$DNS1" ] && echo "nameserver $DNS1 # ppp temp entry" >> /etc/resolv.conf
|
||||
[ -n "$DNS2" ] && echo "nameserver $DNS2 # ppp temp entry" >> /etc/resolv.conf
|
||||
fi
|
||||
|
||||
/etc/ppp/ip-up.ipv6to4 ${LOGDEVICE}
|
||||
|
||||
[ -x /etc/ppp/ip-up.local ] && /etc/ppp/ip-up.local "$@"
|
||||
|
||||
# These variables are for the use of the scripts run by run-parts
|
||||
PPP_IFACE="$1"
|
||||
PPP_TTY="$2"
|
||||
PPP_SPEED="$3"
|
||||
PPP_LOCAL="$4"
|
||||
PPP_REMOTE="$5"
|
||||
PPP_IPPARAM="$6"
|
||||
export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
|
||||
|
||||
if [ -d /etc/ppp/ip-up.d/ -a -x /usr/bin/run-parts ]; then
|
||||
/usr/bin/run-parts /etc/ppp/ip-up.d/
|
||||
fi
|
||||
|
||||
if [ -x /usr/sbin/sendmail ];then
|
||||
/usr/sbin/sendmail -q 2>/dev/null >/dev/null &
|
||||
fi
|
||||
|
||||
exit 0
|
||||
193
ip-up.ipv6to4
Normal file
193
ip-up.ipv6to4
Normal file
|
|
@ -0,0 +1,193 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# ip-up.ipv6to4
|
||||
#
|
||||
#
|
||||
# Taken from:
|
||||
# (P) & (C) 2000-2005 by Peter Bieringer <pb@bieringer.de>
|
||||
#
|
||||
# You will find more information on the initscripts-ipv6 homepage at
|
||||
# http://www.deepspace6.net/projects/initscripts-ipv6.html
|
||||
#
|
||||
# Version: 2005-09-22
|
||||
#
|
||||
# Calling parameters:
|
||||
# $1: interface name
|
||||
#
|
||||
# Called (mostly) by /etc/ppp/ip-up.local
|
||||
# like: /etc/ppp/ip-up.ipv6to4 $1 >>/var/log/ppp-ipv6to4.log 2>&1
|
||||
#
|
||||
# Note: this script will *kill* older still existing 6to4 tunnels regardless
|
||||
# whether they were set before by another device
|
||||
#
|
||||
# Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
|
||||
# IPV6TO4INIT=yes|no: controls configuration
|
||||
# IPV6TO4_IPV4ADDR=<IPv4 address>: special local address for 6to4 tunneling (only needed behind a NAT gateway)
|
||||
# IPV6TO4_RELAY=<IPv4 address>: remote 6to4 relay router address (default: 192.88.99.1)
|
||||
# IPV6TO4_MTU=<MTU for IPv6>: controls IPv6 MTU for the 6to4 link (optional, default is MTU of interface - 20)
|
||||
# IPV6TO4_ROUTING="<device>-<suffix>/<prefix length> ...": information to setup additional interfaces
|
||||
# Example: IPV6TO4_ROUTING="eth0-:f101::1/64 eth1-:f102::1/64"
|
||||
#
|
||||
# IPV6_CONTROL_RADVD=yes|no: controls radvd triggering
|
||||
# IPV6_RADVD_PIDFILE=<file>: PID file of radvd for sending signals, default is "/var/run/radvd/radvd.pid"
|
||||
# IPV6_RADVD_TRIGGER_ACTION=startstop|reload|restart|SIGHUP: how to trigger radvd (optional, default is SIGHUP)
|
||||
#
|
||||
# Requirements
|
||||
# radvd-0.6.2p3 or newer supporting option "Base6to4Interface"
|
||||
#
|
||||
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo $"Argument 1 is empty but should contain interface name - skip IPv6to4 initialization"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Get global network configuration
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Source IPv4 helper functions
|
||||
cd /etc/sysconfig/network-scripts
|
||||
. ./network-functions
|
||||
|
||||
CONFIG=$1
|
||||
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
|
||||
source_config
|
||||
|
||||
# IPv6 don't need aliases anymore, config is skipped
|
||||
REALDEVICE=${DEVICE%%:*}
|
||||
[ "$DEVICE" != "$REALDEVICE" ] && exit 0
|
||||
|
||||
if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
. /etc/sysconfig/network-scripts/network-functions-ipv6
|
||||
|
||||
|
||||
# Run basic IPv6 test (and make sure the ipv6 module will be loaded), if not ok, skip IPv6 initialization
|
||||
ipv6_test || exit 1
|
||||
|
||||
# Setup of 6to4, if configured
|
||||
valid6to4config="yes"
|
||||
if [ "$IPV6TO4INIT" = "yes" ]; then
|
||||
if [ -n "$IPV6TO4_IPV4ADDR" ]; then
|
||||
# Take 6to4-dedicated configured IPv4 address from config file (precedence 1)
|
||||
ipv4addr="$IPV6TO4_IPV4ADDR"
|
||||
else
|
||||
# Get IPv4 address from interface (precedence 2)
|
||||
ipv4addr="$(ipv6_get_ipv4addr_of_device $DEVICE)"
|
||||
if [ -z "$ipv4addr" ]; then
|
||||
# Take configured IPv4 address of interface from config file (precedence 3)
|
||||
ipv4addr="$IPADDR"
|
||||
fi
|
||||
fi
|
||||
if [ -n "$ipv4addr" ]; then
|
||||
# Test for non-global IPv4 address
|
||||
if ! ipv6_test_ipv4_addr_global_usable $ipv4addr; then
|
||||
net_log $"Given IPv4 address '$ipv4addr' is not globally usable" info
|
||||
valid6to4config="no"
|
||||
fi
|
||||
else
|
||||
net_log $"IPv6to4 configuration needs an IPv4 address on related interface or otherwise specified" info
|
||||
valid6to4config="no"
|
||||
fi
|
||||
if [ -z "$IPV6TO4_RELAY" ]; then
|
||||
IPV6TO4_RELAY="192.88.99.1"
|
||||
fi
|
||||
|
||||
# Check/generate relay address
|
||||
ipv6to4_relay="$(ipv6_create_6to4_relay_address $IPV6TO4_RELAY)"
|
||||
if [ $? -ne 0 ]; then
|
||||
valid6to4config="no"
|
||||
fi
|
||||
|
||||
if [ "$valid6to4config" = "yes" ]; then
|
||||
# Delete routes to local networks
|
||||
for devsuf in $IPV6TO4_ROUTING; do
|
||||
dev="${devsuf%%-*}"
|
||||
ipv6_cleanup_6to4_device $dev
|
||||
done
|
||||
|
||||
# Cleanup all old data (needed, if "ip-down.ipv6to4" wasn't executed), delete all configured 6to4 address
|
||||
ipv6_cleanup_6to4_tunnels tun6to4
|
||||
|
||||
# Get MTU of master device
|
||||
ipv4mtu="$(/sbin/ip link show dev $DEVICE | awk '/\<mtu\>/ { print $5 }')"
|
||||
if [ -n "$ipv4mtu" ]; then
|
||||
# IPv6 tunnel MTU is IPv4 MTU minus 20 for IPv4 header
|
||||
tunnelmtu=$[ $ipv4mtu - 20 ]
|
||||
fi
|
||||
|
||||
if [ -n "$IPV6TO4_MTU" ]; then
|
||||
if [ $IPV6TO4_MTU -gt $tunnelmtu ]; then
|
||||
net_log $"Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of '$tunnelmtu', ignored" warning
|
||||
else
|
||||
tunnelmtu=$IPV6TO4_MTU
|
||||
fi
|
||||
fi
|
||||
|
||||
# Setup new data
|
||||
ipv6_add_6to4_tunnel tun6to4 $ipv4addr "" $tunnelmtu || exit 1
|
||||
|
||||
# Add route to for compatible addresses (removed later again)
|
||||
ipv6_add_route "::/96" "::" tun6to4
|
||||
|
||||
# Add default route, if device matches
|
||||
if [ "$IPV6_DEFAULTDEV" = "tun6to4" ]; then
|
||||
if [ -n "$IPV6_DEFAULTGW" ]; then
|
||||
net_log $"Warning: interface 'tun6to4' does not support 'IPV6_DEFAULTGW', ignored" warning
|
||||
fi
|
||||
ipv6_set_default_route $ipv6to4_relay tun6to4
|
||||
fi
|
||||
|
||||
# Add static routes
|
||||
if [ -f /etc/sysconfig/static-routes-ipv6 ]; then
|
||||
LC_ALL=C grep -w "^tun6to4" /etc/sysconfig/static-routes-ipv6 | while read device network gateway; do
|
||||
if [ -z "$network" ]; then
|
||||
continue
|
||||
fi
|
||||
if [ -z "$gateway" ]; then
|
||||
gateway="$ipv6to4_relay"
|
||||
fi
|
||||
ipv6_add_route $network $gateway tun6to4
|
||||
done
|
||||
fi
|
||||
|
||||
# Setup additional static IPv6 routes (newer config style)
|
||||
if [ -f "/etc/sysconfig/network-scripts/route6-tun6to4" ]; then
|
||||
sed -ne 's/#.*//' -e '/[^[:space:]]/p' /etc/sysconfig/network-scripts/route6-tun6to4 | while read line; do
|
||||
if echo "$line" | grep -vq 'via'; then
|
||||
# Add gateway if missing
|
||||
line="$line via $ipv6to4_relay"
|
||||
fi
|
||||
/sbin/ip -6 route add $line
|
||||
done
|
||||
fi
|
||||
|
||||
# Cleanup autmatically generated autotunnel (not needed for 6to4)
|
||||
/sbin/ip -6 route del ::/96 dev tun6to4
|
||||
/sbin/ip -6 addr del tun6to4 "::$ipv4addr/128" dev tun6to4
|
||||
|
||||
if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then
|
||||
# Control running radvd
|
||||
ipv6_trigger_radvd up "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE
|
||||
|
||||
if [ -n "$IPV6TO4_ROUTING" ]; then
|
||||
# Generate 6to4 address
|
||||
ipv6to4prefix="$(ipv6_create_6to4_prefix $ipv4addr)"
|
||||
if [ -n "$ipv6to4prefix" ]; then
|
||||
# Add IPv6 address to interface (required interface route will be set automatically)
|
||||
for devsuf in $IPV6TO4_ROUTING; do
|
||||
dev="${devsuf%%-*}"
|
||||
suf="$(echo $devsuf | awk -F- '{ print $2 }')"
|
||||
ipv6_add_addr_on_device ${dev} ${ipv6to4prefix}${suf}
|
||||
done
|
||||
else
|
||||
net_log $"Error occurred while calculating the IPv6to4 prefix"
|
||||
fi
|
||||
else
|
||||
net_log $"radvd control enabled, but config is not complete"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
70
ipv6-down
Normal file
70
ipv6-down
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# ipv6-down
|
||||
#
|
||||
# Called by pppd after IPV6CP/down was finished
|
||||
#
|
||||
# This file should not be modified -- make local changes to
|
||||
# /etc/ppp/ipv6-down.local instead
|
||||
#
|
||||
#
|
||||
# Taken from:
|
||||
# (P) & (C) 2001-2006 by Peter Bieringer <pb@bieringer.de>
|
||||
#
|
||||
# You will find more information on the initscripts-ipv6 homepage at
|
||||
# http://www.deepspace6.net/projects/initscripts-ipv6.html
|
||||
#
|
||||
# RHL integration assistance by Pekka Savola <pekkas@netcore.fi>
|
||||
#
|
||||
# Calling parameters:
|
||||
# $1: interface name
|
||||
# $6: logical interface name (set by pppd option ipparam)
|
||||
#
|
||||
# Version 2006-08-02
|
||||
#
|
||||
# Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
|
||||
# IPV6INIT=yes|no: controls IPv6 configuration for this interface
|
||||
#
|
||||
|
||||
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
export PATH
|
||||
|
||||
LOGDEVICE=$6
|
||||
REALDEVICE=$1
|
||||
|
||||
[ -f /etc/sysconfig/network ] || exit 0
|
||||
. /etc/sysconfig/network
|
||||
|
||||
cd /etc/sysconfig/network-scripts
|
||||
. ./network-functions
|
||||
|
||||
CONFIG=$LOGDEVICE
|
||||
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
|
||||
source_config
|
||||
|
||||
[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
|
||||
. /etc/sysconfig/network-scripts/network-functions-ipv6
|
||||
|
||||
[ -x /etc/ppp/ipv6-down.local ] && /etc/ppp/ipv6-down.local "$@"
|
||||
|
||||
|
||||
if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then
|
||||
# Control running radvd
|
||||
ipv6_trigger_radvd down "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE
|
||||
fi
|
||||
|
||||
# IPv6 test, no module loaded, exit if system is not IPv6-ready
|
||||
ipv6_test testonly || exit 0
|
||||
|
||||
# Test device status
|
||||
ipv6_test_device_status $REALDEVICE
|
||||
if [ $? != 0 -a $? != 11 ]; then
|
||||
# device doesn't exist or other problem occurs
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Delete all current configured IPv6 addresses on this interface
|
||||
ipv6_cleanup_device $REALDEVICE
|
||||
|
||||
exit 0
|
||||
112
ipv6-up
Normal file
112
ipv6-up
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# ipv6-up
|
||||
#
|
||||
# Called by pppd after IPV6CP/up was finished
|
||||
#
|
||||
# This file should not be modified -- make local changes to
|
||||
# /etc/ppp/ipv6-up.local instead
|
||||
#
|
||||
# Taken from:
|
||||
# (P) & (C) 2001-2006 by Peter Bieringer <pb@bieringer.de>
|
||||
#
|
||||
# You will find more information on the initscripts-ipv6 homepage at
|
||||
# http://www.deepspace6.net/projects/initscripts-ipv6.html
|
||||
#
|
||||
# RHL integration assistance by Pekka Savola <pekkas@netcore.fi>
|
||||
#
|
||||
# Calling parameters:
|
||||
# $1: interface name
|
||||
# $6: logical interface name (set by pppd option ipparam)
|
||||
#
|
||||
#
|
||||
# Version: 2006-08-02
|
||||
#
|
||||
# Uses following information from "/etc/sysconfig/network":
|
||||
# IPV6_DEFAULTDEV=<device>: controls default route (optional)
|
||||
#
|
||||
# Uses following information from "/etc/sysconfig/network-scripts/ifcfg-$1":
|
||||
# IPV6INIT=yes|no: controls IPv6 configuration for this interface
|
||||
# IPV6ADDR=<IPv6 address>[/<prefix length>]: specify primary static IPv6 address
|
||||
# IPV6ADDR_SECONDARIES="<IPv6 address>[/<prefix length>] ..." (optional)
|
||||
# IPV6_MTU=<MTU for IPv6>: controls IPv6 MTU for this link (optional)
|
||||
#
|
||||
|
||||
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
export PATH
|
||||
|
||||
LOGDEVICE=$6
|
||||
REALDEVICE=$1
|
||||
|
||||
[ -f /etc/sysconfig/network ] || exit 0
|
||||
. /etc/sysconfig/network
|
||||
|
||||
cd /etc/sysconfig/network-scripts
|
||||
. ./network-functions
|
||||
. ./network-functions-ipv6
|
||||
|
||||
CONFIG=$LOGDEVICE
|
||||
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
|
||||
source_config
|
||||
|
||||
# Test whether IPv6 configuration is enabled for this interface, else stop
|
||||
[ "$IPV6INIT" = "yes" ] || exit 0
|
||||
|
||||
[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
|
||||
. /etc/sysconfig/network-scripts/network-functions-ipv6
|
||||
|
||||
# IPv6 test, module loaded, exit if system is not IPv6-ready
|
||||
ipv6_test || exit 1
|
||||
|
||||
# Test device status
|
||||
ipv6_test_device_status $REALDEVICE
|
||||
if [ $? != 0 -a $? != 11 ]; then
|
||||
# device doesn't exist or other problem occurs
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Setup IPv6 address on specified interface
|
||||
if [ -n "$IPV6ADDR" ]; then
|
||||
ipv6_add_addr_on_device $REALDEVICE $IPV6ADDR || exit 1
|
||||
fi
|
||||
|
||||
# Set IPv6 MTU, if given
|
||||
if [ -n "$IPV6_MTU" ]; then
|
||||
ipv6_set_mtu $REALDEVICE $IPV6_MTU
|
||||
fi
|
||||
|
||||
# Setup additional IPv6 addresses from list, if given
|
||||
if [ -n "$IPV6ADDR_SECONDARIES" ]; then
|
||||
for ipv6addr in $IPV6ADDR_SECONDARIES; do
|
||||
ipv6_add_addr_on_device $REALDEVICE $ipv6addr
|
||||
done
|
||||
fi
|
||||
|
||||
# Setup default IPv6 route through device
|
||||
if [ "$IPV6_DEFAULTDEV" = "$LOGDEVICE" ]; then
|
||||
ipv6_set_default_route "" "$REALDEVICE" "$REALDEVICE"
|
||||
fi
|
||||
|
||||
# Setup additional static IPv6 routes on specified interface, if given
|
||||
if [ -f /etc/sysconfig/static-routes-ipv6 ]; then
|
||||
LC_ALL=C grep -w "^$LOGDEVICE" /etc/sysconfig/static-routes-ipv6 | while read device args; do
|
||||
ipv6_add_route $args $REALDEVICE
|
||||
done
|
||||
fi
|
||||
|
||||
# Setup additional static IPv6 routes (newer config style)
|
||||
if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then
|
||||
sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$DEVICE" | while read line; do
|
||||
/sbin/ip -6 route add $line
|
||||
done
|
||||
fi
|
||||
|
||||
if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then
|
||||
# Control running radvd
|
||||
ipv6_trigger_radvd up "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE
|
||||
fi
|
||||
|
||||
[ -x /etc/ppp/ipv6-up.local ] && /etc/ppp/ipv6-up.local "$@"
|
||||
|
||||
exit 0
|
||||
46
ppp.spec
46
ppp.spec
|
|
@ -3,7 +3,7 @@
|
|||
Summary: The PPP daemon and documentation
|
||||
Name: ppp
|
||||
Version: 2.4.7
|
||||
Release: 3
|
||||
Release: 4
|
||||
License: BSD-like
|
||||
Group: System/Servers
|
||||
Url: http://www.samba.org/ppp/
|
||||
|
|
@ -14,6 +14,15 @@ Source3: README.pppoatm
|
|||
Source4: ppp.logrotate
|
||||
Source5: ppp-dhcpc.tar.bz2
|
||||
Source6: ppp-tmpfiles.conf
|
||||
Source104: ip-down
|
||||
Source105: ip-down.ipv6to4
|
||||
Source106: ip-up
|
||||
Source107: ip-up.ipv6to4
|
||||
Source108: ipv6-down
|
||||
Source109: ipv6-up
|
||||
Source110: ifup-ppp
|
||||
Source111: ifdown-ppp
|
||||
Source112: ppp-watch.tar.xz
|
||||
Patch0: ppp-2.4.7-make.patch
|
||||
Patch1: ppp-2.3.6-sample.patch
|
||||
Patch2: ppp-options.patch
|
||||
|
|
@ -34,7 +43,12 @@ BuildRequires: atm-devel
|
|||
BuildRequires: pcap-devel
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: glib2-devel
|
||||
Requires(post): systemd
|
||||
Requires: glibc >= 2.0.6
|
||||
Requires: initscripts >= 9.54
|
||||
|
||||
%description
|
||||
The ppp package contains the PPP (Point-to-Point Protocol) daemon
|
||||
|
|
@ -50,6 +64,16 @@ the PPP protocol.
|
|||
%{_sbindir}/pppdump
|
||||
%attr(5755,root,root) %{_sbindir}/pppd
|
||||
%attr(0755,root,daemon) %{_sbindir}/pppstats
|
||||
%{_sbindir}/ppp-watch
|
||||
%dir %{_sysconfdir}/ppp
|
||||
%{_sysconfdir}/ppp/ip-up
|
||||
%{_sysconfdir}/ppp/ip-down
|
||||
%{_sysconfdir}/ppp/ip-up.ipv6to4
|
||||
%{_sysconfdir}/ppp/ip-down.ipv6to4
|
||||
%{_sysconfdir}/ppp/ipv6-up
|
||||
%{_sysconfdir}/ppp/ipv6-down
|
||||
%{_sysconfdir}/sysconfig/network-scripts/ifdown-ppp
|
||||
%{_sysconfdir}/sysconfig/network-scripts/ifup-ppp
|
||||
%{_mandir}/man*/*
|
||||
%exclude %{_mandir}/man8/*rad*
|
||||
%dir %{_libdir}/pppd
|
||||
|
|
@ -58,7 +82,6 @@ the PPP protocol.
|
|||
%exclude %{_libdir}/pppd/%{version}/rp-pppoe.so
|
||||
%exclude %{_libdir}/pppd/%{version}/rad*
|
||||
%exclude %{_libdir}/pppd/%{version}/dhcpc.so
|
||||
%dir %{_sysconfdir}/ppp
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
%ghost %dir %{_var}/run/ppp
|
||||
%ghost %{_var}/run/ppp/resolv.conf
|
||||
|
|
@ -181,6 +204,8 @@ popd
|
|||
%patch12 -p1 -b .dhcp
|
||||
%patch13 -p1 -b .nostrip
|
||||
|
||||
tar -xJf %{SOURCE112}
|
||||
|
||||
# lib64 fixes
|
||||
perl -pi -e "s|^(LIBDIR.*)\\\$\(DESTDIR\)/lib|\1\\\$(INSTROOT)%{_libdir}|g" pppd/Makefile.linux pppd/plugins/Makefile.linux pppd/plugins/{pppoatm,radius,rp-pppoe,pppol2tp}/Makefile.linux
|
||||
perl -pi -e "s|(--prefix=/usr)|\1 --libdir=%{_libdir}|g" pppd/plugins/radius/Makefile.linux
|
||||
|
|
@ -206,12 +231,14 @@ perl -pi -e "s/openssl/openssl -DOPENSSL_NO_SHA1/;" openssl/crypto/sha/Makefile
|
|||
%configure2_5x
|
||||
%make RPM_OPT_FLAGS="%{optflags}" LIBDIR=%{_libdir}
|
||||
%make -C pppd/plugins -f Makefile.linux
|
||||
%make -C ppp-watch %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}{%{_sbindir},%{_bindir},/usr/X11R6/bin/,%{_mandir}/man8,%{_sysconfdir}/{ppp/peers,pam.d}}
|
||||
|
||||
%makeinstall LIBDIR=%{buildroot}%{_libdir}/pppd/%{version}/ INSTALL=install -C pppd/plugins/dhcp
|
||||
%makeinstall INSTROOT=%{buildroot} SUBDIRS="pppoatm rp-pppoe radius pppol2tp"
|
||||
%makeinstall ROOT=%{buildroot} mandir=/usr/share/man -C ppp-watch install
|
||||
|
||||
%multiarch_includes %{buildroot}%{_includedir}/pppd/pathnames.h
|
||||
|
||||
|
|
@ -235,5 +262,18 @@ ln -s ../../var/run/ppp/resolv.conf %{buildroot}%{_sysconfdir}/ppp/resolv.conf
|
|||
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
||||
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/ppp
|
||||
|
||||
#install tmpfiles conf
|
||||
# install tmpfiles conf
|
||||
install -m644 -D %{SOURCE6} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||
|
||||
# install scripts (previously owned by initscripts package)
|
||||
install -d %{buildroot}%{_sysconfdir}/ppp
|
||||
install -p %{SOURCE104} %{buildroot}%{_sysconfdir}/ppp/ip-down
|
||||
install -p %{SOURCE105} %{buildroot}%{_sysconfdir}/ppp/ip-down.ipv6to4
|
||||
install -p %{SOURCE106} %{buildroot}%{_sysconfdir}/ppp/ip-up
|
||||
install -p %{SOURCE107} %{buildroot}%{_sysconfdir}/ppp/ip-up.ipv6to4
|
||||
install -p %{SOURCE108} %{buildroot}%{_sysconfdir}/ppp/ipv6-down
|
||||
install -p %{SOURCE109} %{buildroot}%{_sysconfdir}/ppp/ipv6-up
|
||||
|
||||
install -d %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/
|
||||
install -p %{SOURCE110} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ppp
|
||||
install -p %{SOURCE111} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdown-ppp
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue