SVN: rc-scripts/trunk: Makefile.am configure.ac doc/net-scripts.txt lib lib/Makefile.am lib/ifdown l...
glen
glen at pld-linux.org
Sun Aug 14 13:31:52 CEST 2011
Author: glen
Date: Sun Aug 14 13:31:52 2011
New Revision: 12310
Added:
rc-scripts/trunk/lib/
- copied from rev 12309, rc-scripts/trunk/sysconfig/network-scripts/
Removed:
rc-scripts/trunk/sysconfig/network-scripts/
Modified:
rc-scripts/trunk/Makefile.am
rc-scripts/trunk/configure.ac
rc-scripts/trunk/doc/net-scripts.txt
rc-scripts/trunk/lib/Makefile.am
rc-scripts/trunk/lib/ifdown
rc-scripts/trunk/lib/ifdown-br
rc-scripts/trunk/lib/ifdown-irda
rc-scripts/trunk/lib/ifdown-post
rc-scripts/trunk/lib/ifdown-ppp
rc-scripts/trunk/lib/ifdown-sl
rc-scripts/trunk/lib/ifdown-vlan
rc-scripts/trunk/lib/ifup
rc-scripts/trunk/lib/ifup-br
rc-scripts/trunk/lib/ifup-ipx
rc-scripts/trunk/lib/ifup-irda
rc-scripts/trunk/lib/ifup-iucv
rc-scripts/trunk/lib/ifup-plip
rc-scripts/trunk/lib/ifup-plusb
rc-scripts/trunk/lib/ifup-post
rc-scripts/trunk/lib/ifup-ppp
rc-scripts/trunk/lib/ifup-sl
rc-scripts/trunk/lib/ifup-vlan
rc-scripts/trunk/lib/tnldown
rc-scripts/trunk/lib/tnlup
rc-scripts/trunk/man/usernetctl.8
rc-scripts/trunk/ppp/auth-down
rc-scripts/trunk/ppp/auth-up
rc-scripts/trunk/ppp/ip-down
rc-scripts/trunk/ppp/ip-up
rc-scripts/trunk/ppp/ipx-down
rc-scripts/trunk/ppp/ipx-up
rc-scripts/trunk/rc.d/init.d/network
rc-scripts/trunk/src/ppp-watch.c
rc-scripts/trunk/sysconfig/Makefile.am
Log:
- move network scripts to /lib, as none of them are config files
- version 0.4.5 for such major change
Modified: rc-scripts/trunk/Makefile.am
==============================================================================
--- rc-scripts/trunk/Makefile.am (original)
+++ rc-scripts/trunk/Makefile.am Sun Aug 14 13:31:52 2011
@@ -2,7 +2,7 @@
# $Id$
#
-SUBDIRS = src ppp isapnp sysconfig rc.d doc man po init
+SUBDIRS = src lib ppp isapnp sysconfig rc.d doc man po init
sysconf_DATA = \
adjtime \
Modified: rc-scripts/trunk/configure.ac
==============================================================================
--- rc-scripts/trunk/configure.ac (original)
+++ rc-scripts/trunk/configure.ac Sun Aug 14 13:31:52 2011
@@ -1,13 +1,13 @@
dnl $Id$
-AC_INIT([rc-scripts], [0.4.4.3], [pld-rc-scripts at lists.pld-linux.org], [rc-scripts])
+AC_INIT([rc-scripts], [0.4.5], [pld-rc-scripts at lists.pld-linux.org], [rc-scripts])
AM_INIT_AUTOMAKE
ALL_LINGUAS="pl de"
echo -n "Finding shell scripts"
SHSCRIPTS=""
-for shfile in $(find ${srcdir}/rc.d ${srcdir}/sysconfig ! -path "*/\.*/*" ! -name "*~" -type f); do
+for shfile in $(find ${srcdir}/rc.d ${srcdir}/sysconfig ${srcdir}/lib ! -path "*/\.*/*" ! -name "*~" -type f); do
echo -n "."
if (LC_ALL=C file ${shfile} | grep -q 'shell script'); then
SHSCRIPTS="${SHSCRIPTS} ${shfile}"
@@ -26,11 +26,11 @@
sysconfigdir='${sysconfdir}/sysconfig'
updir='${sysconfigdir}/interfaces/up.d'
downdir='${sysconfigdir}/interfaces/down.d'
-networkscriptsdir='${sysconfigdir}/network-scripts'
+networkscriptsdir='${exec_prefix}/lib/${PACKAGE}'
rcdir='${sysconfdir}/rc.d'
initdir='${sysconfdir}/init'
firmwaredir='${exec_prefix}/lib/firmware'
-docdir="${prefix}/doc/$PACKAGE-$VERSION"
+docdir="${prefix}/doc/${PACKAGE}-${VERSION}"
dnl i18n support
AC_PATH_PROGS(MSGMERGE, msgmerge)
@@ -195,6 +195,7 @@
AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_FILES([Makefile \
src/Makefile \
+ lib/Makefile \
doc/Makefile \
man/Makefile \
man/de/Makefile \
@@ -208,7 +209,6 @@
sysconfig/Makefile \
sysconfig/cpusets/Makefile \
sysconfig/hwprofiles/Makefile \
- sysconfig/network-scripts/Makefile \
sysconfig/interfaces/Makefile \
sysconfig/interfaces/data/Makefile \
sysconfig/interfaces/up.d/Makefile \
Modified: rc-scripts/trunk/doc/net-scripts.txt
==============================================================================
--- rc-scripts/trunk/doc/net-scripts.txt (original)
+++ rc-scripts/trunk/doc/net-scripts.txt Sun Aug 14 13:31:52 2011
@@ -23,10 +23,10 @@
most of the code for handling alternative interface configurations
and interface change notification through netreport.
-/etc/sysconfig/network-scripts/ifup-post
+/lib/rc-scripts/ifup-post
Called when any network device EXCEPT a SLIP (with dip) device comes
- up. Calls /etc/sysconfig/network-scripts/ifup-routes to
+ up. Calls /lib/rc-scripts/ifup-routes to
bring up static routes that depend on that device. Calls
/sbin/network-scripts/ifup-aliases to bring up
aliases for that device. Sets the hostname if it is not
@@ -37,15 +37,15 @@
Could be extended to fix up nameservice configuration, call
arbitrary scripts, etc, as needed.
-/etc/sysconfig/network-scripts/ifup-routes
+/lib/rc-scripts/ifup-routes
Set up static routes for a device.
-/etc/sysconfig/network-scripts/ifup-aliases
+/lib/rc-scripts/ifup-aliases
Bring up aliases for a device.
-/etc/sysconfig/network-scripts/ifdhcpc-done
+/lib/rc-scripts/ifdhcpc-done
Called by dhcpcd once dhcp configuration is complete; sets
up /etc/resolv.conf from the version dhcpcd dropped in
@@ -91,7 +91,7 @@
Ethernet-only items:
{IPXNETNUM,IPXPRIMARY,IPXACTIVE}_{802_2,802_3,ETHERII,SNAP}
configuration matrix for IPX. Only used if IPX is active.
- Managed from /etc/sysconfig/network-scripts/ifup-ipx
+ Managed from /lib/rc-scripts/ifup-ipx
Deprecated, but supported:
ETHTOOL_OPTS=...
Modified: rc-scripts/trunk/lib/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/Makefile.am (original)
+++ rc-scripts/trunk/lib/Makefile.am Sun Aug 14 13:31:52 2011
@@ -30,13 +30,13 @@
ifup-vlan
networkscripts_DATA = \
- functions.network
-
+ functions.network
+
#SUBDIRS = data
interfacesdir = @sysconfigdir@/interfaces
-interfaces_DATA =
+interfaces_DATA =
EXTRA_DIST = \
$(interfaces_DATA) \
Modified: rc-scripts/trunk/lib/ifdown
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown (original)
+++ rc-scripts/trunk/lib/ifdown Sun Aug 14 13:31:52 2011
@@ -6,7 +6,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
# Will be removed in the future
if is_yes "$NETWORKING" ; then
@@ -44,7 +44,7 @@
# set all major variables
setup_ip_param
-OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}"
+OTHERSCRIPT="/lib/rc-scripts/ifdown-${DEVICETYPE}"
# shutdown tleds software
if [ "$TLEDS_DEV" = "$DEVICE" -a -x /usr/bin/tleds ]; then
@@ -151,4 +151,4 @@
fi
fi
-exec /etc/sysconfig/network-scripts/ifdown-post $CONFIG
+exec /lib/rc-scripts/ifdown-post $CONFIG
Modified: rc-scripts/trunk/lib/ifdown-br
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-br (original)
+++ rc-scripts/trunk/lib/ifdown-br Sun Aug 14 13:31:52 2011
@@ -23,7 +23,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
Modified: rc-scripts/trunk/lib/ifdown-irda
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-irda (original)
+++ rc-scripts/trunk/lib/ifdown-irda Sun Aug 14 13:31:52 2011
@@ -21,10 +21,10 @@
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-cd /etc/sysconfig/network-scripts
+cd /lib/rc-scripts
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
@@ -56,12 +56,12 @@
kill $PID > /dev/null 2>&1
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
+ /lib/rc-scripts/ifdown-post $1
exit 0
fi
sleep 2
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
+ /lib/rc-scripts/ifdown-post $1
exit 0
fi
@@ -69,7 +69,7 @@
if [ -d /proc/$PID ]; then
logger -p daemon.info -t ifdown-irda "$(nls 'ifdown-%s unable to kill %s for %s' "irda" "irattach" "$DEVICE")" &
else
- /etc/sysconfig/network-scripts/ifdown-post $1
+ /lib/rc-scripts/ifdown-post $1
fi
exit 1
Modified: rc-scripts/trunk/lib/ifdown-post
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-post (original)
+++ rc-scripts/trunk/lib/ifdown-post Sun Aug 14 13:31:52 2011
@@ -10,7 +10,7 @@
CONFIG=$1
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
source_config
Modified: rc-scripts/trunk/lib/ifdown-ppp
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-ppp (original)
+++ rc-scripts/trunk/lib/ifdown-ppp Sun Aug 14 13:31:52 2011
@@ -6,7 +6,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
@@ -50,6 +50,6 @@
fi
fi
-/etc/sysconfig/network-scripts/ifdown-post $1
+/lib/rc-scripts/ifdown-post $1
exit 1
Modified: rc-scripts/trunk/lib/ifdown-sl
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-sl (original)
+++ rc-scripts/trunk/lib/ifdown-sl Sun Aug 14 13:31:52 2011
@@ -6,7 +6,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
@@ -45,12 +45,12 @@
kill $PID > /dev/null 2>&1
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
+ /lib/rc-scripts/ifdown-post $1
exit 0
fi
sleep 2
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
+ /lib/rc-scripts/ifdown-post $1
exit 0
fi
@@ -58,7 +58,7 @@
if [ -d /proc/$PID ]; then
logger -p daemon.info -t ifdown-sl "ifdown-sl unable to kill sl-$DEVICE" &
else
- /etc/sysconfig/network-scripts/ifdown-post $1
+ /lib/rc-scripts/ifdown-post $1
fi
exit 1
Modified: rc-scripts/trunk/lib/ifdown-vlan
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan (original)
+++ rc-scripts/trunk/lib/ifdown-vlan Sun Aug 14 13:31:52 2011
@@ -21,10 +21,10 @@
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-cd /etc/sysconfig/network-scripts
+cd /lib/rc-scripts
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
Modified: rc-scripts/trunk/lib/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup (original)
+++ rc-scripts/trunk/lib/ifup Sun Aug 14 13:31:52 2011
@@ -6,7 +6,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
# Will be removed in the future
if is_yes "$NETWORKING"; then
@@ -64,7 +64,7 @@
# set all major variables
setup_ip_param
-OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-${DEVICETYPE}"
+OTHERSCRIPT="/lib/rc-scripts/ifup-${DEVICETYPE}"
if [ -x "$OTHERSCRIPT" ]; then
if is_yes "$DEFAULTHANDLING"; then
@@ -240,7 +240,7 @@
fi
if is_yes "$IPX"; then
- /etc/sysconfig/network-scripts/ifup-ipx $DEVICE
+ /lib/rc-scripts/ifup-ipx $DEVICE
fi
if is_yes "$ENABLE_6TO4"; then
@@ -268,4 +268,4 @@
exit 0
fi
-exec /etc/sysconfig/network-scripts/ifup-post $CONFIG
+exec /lib/rc-scripts/ifup-post $CONFIG
Modified: rc-scripts/trunk/lib/ifup-br
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-br (original)
+++ rc-scripts/trunk/lib/ifup-br Sun Aug 14 13:31:52 2011
@@ -23,7 +23,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
Modified: rc-scripts/trunk/lib/ifup-ipx
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-ipx (original)
+++ rc-scripts/trunk/lib/ifup-ipx Sun Aug 14 13:31:52 2011
@@ -6,7 +6,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -24,7 +24,7 @@
exit 1
fi
-cd /etc/sysconfig/network-scripts
+cd /lib/rc-scripts
CONFIG=$1
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
Modified: rc-scripts/trunk/lib/ifup-irda
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-irda (original)
+++ rc-scripts/trunk/lib/ifup-irda Sun Aug 14 13:31:52 2011
@@ -21,10 +21,10 @@
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-cd /etc/sysconfig/network-scripts
+cd /lib/rc-scripts
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
Modified: rc-scripts/trunk/lib/ifup-iucv
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-iucv (original)
+++ rc-scripts/trunk/lib/ifup-iucv Sun Aug 14 13:31:52 2011
@@ -4,10 +4,10 @@
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-cd /etc/sysconfig/network-scripts
+cd /lib/rc-scripts
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
@@ -38,4 +38,4 @@
# IPv4/6 gateways and default routes
setup_ip_gw_ro
-/etc/sysconfig/network-scripts/ifup-post $1
+/lib/rc-scripts/ifup-post $1
Modified: rc-scripts/trunk/lib/ifup-plip
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-plip (original)
+++ rc-scripts/trunk/lib/ifup-plip Sun Aug 14 13:31:52 2011
@@ -6,7 +6,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
@@ -37,4 +37,4 @@
# IPv4/6 gateways and default routes
setup_ip_gw_ro
-/etc/sysconfig/network-scripts/ifup-post $1
+/lib/rc-scripts/ifup-post $1
Modified: rc-scripts/trunk/lib/ifup-plusb
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-plusb (original)
+++ rc-scripts/trunk/lib/ifup-plusb Sun Aug 14 13:31:52 2011
@@ -12,10 +12,10 @@
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-cd /etc/sysconfig/network-scripts
+cd /lib/rc-scripts
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
@@ -46,4 +46,4 @@
# IPv4/6 gateways and default routes
setup_ip_gw_ro
-/etc/sysconfig/network-scripts/ifup-post $1
+/lib/rc-scripts/ifup-post $1
Modified: rc-scripts/trunk/lib/ifup-post
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-post (original)
+++ rc-scripts/trunk/lib/ifup-post Sun Aug 14 13:31:52 2011
@@ -7,7 +7,7 @@
. /etc/rc.d/init.d/functions
. /etc/sysconfig/network
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
need_hostname
CONFIG=$1
@@ -52,9 +52,9 @@
tc filter add dev ${REALDEVICE} parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${BANDWIDTH_IN}kbit burst 10k drop flowid :3
fi
-. /etc/sysconfig/network-scripts/ifup-aliases
-. /etc/sysconfig/network-scripts/ifup-routes
-. /etc/sysconfig/network-scripts/ifup-neigh
+. /lib/rc-scripts/ifup-aliases
+. /lib/rc-scripts/ifup-routes
+. /lib/rc-scripts/ifup-neigh
# don't set hostname on ppp/slip connections
if [ -n "$NEEDHOSTNAME" -a "${DEVICETYPE}" != "ppp" -a "${DEVICETYPE}" != "slip" ]; then
Modified: rc-scripts/trunk/lib/ifup-ppp
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp (original)
+++ rc-scripts/trunk/lib/ifup-ppp Sun Aug 14 13:31:52 2011
@@ -21,7 +21,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
Modified: rc-scripts/trunk/lib/ifup-sl
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-sl (original)
+++ rc-scripts/trunk/lib/ifup-sl Sun Aug 14 13:31:52 2011
@@ -8,7 +8,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
# become a daemon in case we have to persist.
if [ "$1" != daemon ] ; then
@@ -113,5 +113,5 @@
# IPv4/6 gateways and default routes
setup_ip_gw_ro
- /etc/sysconfig/network-scripts/ifup-post $1
+ /lib/rc-scripts/ifup-post $1
fi
Modified: rc-scripts/trunk/lib/ifup-vlan
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan (original)
+++ rc-scripts/trunk/lib/ifup-vlan Sun Aug 14 13:31:52 2011
@@ -21,10 +21,10 @@
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-cd /etc/sysconfig/network-scripts
+cd /lib/rc-scripts
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG=$1
source_config
Modified: rc-scripts/trunk/lib/tnldown
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/tnldown (original)
+++ rc-scripts/trunk/lib/tnldown Sun Aug 14 13:31:52 2011
@@ -22,7 +22,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
DEV=$1
Modified: rc-scripts/trunk/lib/tnlup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/tnlup (original)
+++ rc-scripts/trunk/lib/tnlup Sun Aug 14 13:31:52 2011
@@ -22,7 +22,7 @@
. /etc/sysconfig/network
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
DEV=$1
Modified: rc-scripts/trunk/man/usernetctl.8
==============================================================================
--- rc-scripts/trunk/man/usernetctl.8 (original)
+++ rc-scripts/trunk/man/usernetctl.8 Sun Aug 14 13:31:52 2011
@@ -27,7 +27,7 @@
.I "\fIinterface-name"
The name of the network interface to check; for example, "ppp0". For
backwards compatibility, "ifcfg-ppp0" and
-"/etc/sysconfig/network-scripts/ifcfg-ppp0" are also supported.
+"/lib/rc-scripts/ifcfg-ppp0" are also supported.
.TP
up\fI|\fPdown
Attempt to bring the interface up or down.
Modified: rc-scripts/trunk/ppp/auth-down
==============================================================================
--- rc-scripts/trunk/ppp/auth-down (original)
+++ rc-scripts/trunk/ppp/auth-down Sun Aug 14 13:31:52 2011
@@ -27,7 +27,7 @@
export PPP_IFACE PPP_PEER PPP_USER PPP_TTY PPP_SPEED
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
Modified: rc-scripts/trunk/ppp/auth-up
==============================================================================
--- rc-scripts/trunk/ppp/auth-up (original)
+++ rc-scripts/trunk/ppp/auth-up Sun Aug 14 13:31:52 2011
@@ -27,7 +27,7 @@
export PPP_IFACE PPP_PEER PPP_USER PPP_TTY PPP_SPEED
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
Modified: rc-scripts/trunk/ppp/ip-down
==============================================================================
--- rc-scripts/trunk/ppp/ip-down (original)
+++ rc-scripts/trunk/ppp/ip-down Sun Aug 14 13:31:52 2011
@@ -30,7 +30,7 @@
export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG="/etc/sysconfig/interfaces/ifcfg-$PPP_IPPARAM"
source_config
@@ -44,6 +44,6 @@
run-parts /etc/sysconfig/interfaces/down.d/ppp
-/etc/sysconfig/network-scripts/ifdown-post "${CONFIG}"
+/lib/rc-scripts/ifdown-post "${CONFIG}"
exit 0
Modified: rc-scripts/trunk/ppp/ip-up
==============================================================================
--- rc-scripts/trunk/ppp/ip-up (original)
+++ rc-scripts/trunk/ppp/ip-up Sun Aug 14 13:31:52 2011
@@ -30,7 +30,7 @@
export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG="/etc/sysconfig/interfaces/ifcfg-$PPP_IPPARAM"
source_config
@@ -44,6 +44,6 @@
run-parts /etc/sysconfig/interfaces/up.d/ppp
-/etc/sysconfig/network-scripts/ifup-post "$CONFIG"
+/lib/rc-scripts/ifup-post "$CONFIG"
exit 0
Modified: rc-scripts/trunk/ppp/ipx-down
==============================================================================
--- rc-scripts/trunk/ppp/ipx-down (original)
+++ rc-scripts/trunk/ppp/ipx-down Sun Aug 14 13:31:52 2011
@@ -45,7 +45,7 @@
export PPP_IPPARAM PPP_PID
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
Modified: rc-scripts/trunk/ppp/ipx-up
==============================================================================
--- rc-scripts/trunk/ppp/ipx-up (original)
+++ rc-scripts/trunk/ppp/ipx-up Sun Aug 14 13:31:52 2011
@@ -50,7 +50,7 @@
export PPP_IPPARAM PPP_PID
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
Modified: rc-scripts/trunk/rc.d/init.d/network
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/network (original)
+++ rc-scripts/trunk/rc.d/init.d/network Sun Aug 14 13:31:52 2011
@@ -19,7 +19,7 @@
# Source function library.
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /lib/rc-scripts/functions.network
# Will be removed in the future
if [ -n "$NETWORKING" ] && is_yes "$NETWORKING"; then
Modified: rc-scripts/trunk/src/ppp-watch.c
==============================================================================
--- rc-scripts/trunk/src/ppp-watch.c (original)
+++ rc-scripts/trunk/src/ppp-watch.c Sun Aug 14 13:31:52 2011
@@ -79,7 +79,7 @@
#include "shvar.h"
#define IFCFGPREFIX "/etc/sysconfig/interfaces/ifcfg-"
-#define IFUP_PPP "/etc/sysconfig/network-scripts/ifup-ppp"
+#define IFUP_PPP "/lib/rc-scripts/ifup-ppp"
static int theSigterm = 0;
static int theSigint = 0;
Modified: rc-scripts/trunk/sysconfig/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/Makefile.am (original)
+++ rc-scripts/trunk/sysconfig/Makefile.am Sun Aug 14 13:31:52 2011
@@ -1,6 +1,6 @@
@SET_MAKE@
-SUBDIRS = network-scripts interfaces hwprofiles cpusets
+SUBDIRS = interfaces hwprofiles cpusets
sysconfigdir = @sysconfigdir@
More information about the pld-cvs-commit
mailing list