rc-scripts/trunk: ppp/auth-down ppp/auth-up ppp/ip-down ppp/ip-up
ppp/ipx-down ppp/ipx-up rc.d/init....
baggins
cvs at pld-linux.org
Wed Oct 26 18:33:38 CEST 2005
Author: baggins
Date: Wed Oct 26 18:33:29 2005
New Revision: 6491
Modified:
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/allowlogin
rc-scripts/trunk/rc.d/init.d/cpusets
rc-scripts/trunk/rc.d/init.d/functions
rc-scripts/trunk/rc.d/init.d/killall
rc-scripts/trunk/rc.d/init.d/network
rc-scripts/trunk/rc.d/init.d/random
rc-scripts/trunk/rc.d/init.d/single
rc-scripts/trunk/rc.d/init.d/sys-chroots
rc-scripts/trunk/rc.d/init.d/template.init
rc-scripts/trunk/rc.d/init.d/timezone
rc-scripts/trunk/rc.d/rc
rc-scripts/trunk/rc.d/rc.init
rc-scripts/trunk/rc.d/rc.local
rc-scripts/trunk/rc.d/rc.modules
rc-scripts/trunk/rc.d/rc.shutdown
rc-scripts/trunk/rc.d/rc.sysinit
rc-scripts/trunk/sysconfig/clock
rc-scripts/trunk/sysconfig/interfaces/tnlcfg-description
rc-scripts/trunk/sysconfig/interfaces/tnlcfg-icm
rc-scripts/trunk/sysconfig/network
rc-scripts/trunk/sysconfig/network-scripts/functions.network
rc-scripts/trunk/sysconfig/network-scripts/ifdown
rc-scripts/trunk/sysconfig/network-scripts/ifdown-br
rc-scripts/trunk/sysconfig/network-scripts/ifdown-irda
rc-scripts/trunk/sysconfig/network-scripts/ifdown-post
rc-scripts/trunk/sysconfig/network-scripts/ifdown-ppp
rc-scripts/trunk/sysconfig/network-scripts/ifdown-sl
rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan
rc-scripts/trunk/sysconfig/network-scripts/ifup
rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases
rc-scripts/trunk/sysconfig/network-scripts/ifup-br
rc-scripts/trunk/sysconfig/network-scripts/ifup-ipx
rc-scripts/trunk/sysconfig/network-scripts/ifup-irda
rc-scripts/trunk/sysconfig/network-scripts/ifup-iucv
rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh
rc-scripts/trunk/sysconfig/network-scripts/ifup-plip
rc-scripts/trunk/sysconfig/network-scripts/ifup-plusb
rc-scripts/trunk/sysconfig/network-scripts/ifup-post
rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
rc-scripts/trunk/sysconfig/network-scripts/ifup-routes
rc-scripts/trunk/sysconfig/network-scripts/ifup-sl
rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan
rc-scripts/trunk/sysconfig/network-scripts/tnldown
rc-scripts/trunk/sysconfig/network-scripts/tnlup
rc-scripts/trunk/sysconfig/static-nat
rc-scripts/trunk/sysconfig/static-routes
rc-scripts/trunk/sysconfig/system
rc-scripts/trunk/sysconfig/timezone
Log:
- more vim setting removed (don't convert tabs to spaces)
- white space cleanup
- convert spaces to tabs
- unify formatting for all scripts
Modified: rc-scripts/trunk/ppp/auth-down
==============================================================================
--- rc-scripts/trunk/ppp/auth-down (original)
+++ rc-scripts/trunk/ppp/auth-down Wed Oct 26 18:33:29 2005
@@ -5,16 +5,16 @@
# This script is run by the pppd _after_ the link is brought down.
#
# This script is called with the following arguments:
-# Arg Name Example
-# $1 Interface name ppp0
-# $2 Peer name
-# $3 User name
-# $4 The tty ttyS1
-# $5 The link speed 38400
+# Arg Name Example
+# $1 Interface name ppp0
+# $2 Peer name
+# $3 User name
+# $4 The tty ttyS1
+# $5 The link speed 38400
set +e
-# The environment is cleared before executing this script
+# The environment is cleared before executing this script
# so the path must be reset
PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
export PATH
@@ -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
+. /etc/sysconfig/network-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 Wed Oct 26 18:33:29 2005
@@ -5,16 +5,16 @@
# This script is run by the pppd after the link is established.
#
# This script is called with the following arguments:
-# Arg Name Example
-# $1 Interface name ppp0
-# $2 Peer name
-# $3 User name
-# $4 The tty ttyS1
-# $5 The link speed 38400
+# Arg Name Example
+# $1 Interface name ppp0
+# $2 Peer name
+# $3 User name
+# $4 The tty ttyS1
+# $5 The link speed 38400
set +e
-# The environment is cleared before executing this script
+# The environment is cleared before executing this script
# so the path must be reset
PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
export PATH
@@ -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
+. /etc/sysconfig/network-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
@@ -37,6 +37,6 @@
export PPP_TTYNAME
# Main script starts here.
-[ -x /etc/ppp/auth-up.local ] && /etc/ppp/auth-up.local
+[ -x /etc/ppp/auth-up.local ] && /etc/ppp/auth-up.local
exit 0
Modified: rc-scripts/trunk/ppp/ip-down
==============================================================================
--- rc-scripts/trunk/ppp/ip-down (original)
+++ rc-scripts/trunk/ppp/ip-down Wed Oct 26 18:33:29 2005
@@ -6,17 +6,17 @@
# This script is run by the pppd _after_ the link is brought down.
#
# This script is called with the following arguments:
-# Arg Name Example
-# $1 Interface name ppp0
-# $2 The tty ttyS1
-# $3 The link speed 38400
-# $4 Local IP number 12.34.56.78
-# $5 Peer IP number 12.34.56.99
-# $6 Optional ``ipparam'' value foo
+# Arg Name Example
+# $1 Interface name ppp0
+# $2 The tty ttyS1
+# $3 The link speed 38400
+# $4 Local IP number 12.34.56.78
+# $5 Peer IP number 12.34.56.99
+# $6 Optional ``ipparam'' value foo
set +e
-# The environment is cleared before executing this script
+# The environment is cleared before executing this script
# so the path must be reset
PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
export PATH
@@ -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
+. /etc/sysconfig/network-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
Modified: rc-scripts/trunk/ppp/ip-up
==============================================================================
--- rc-scripts/trunk/ppp/ip-up (original)
+++ rc-scripts/trunk/ppp/ip-up Wed Oct 26 18:33:29 2005
@@ -6,17 +6,17 @@
# This script is run by the pppd after the link is established.
#
# This script is called with the following arguments:
-# Arg Name Example
-# $1 Interface name ppp0
-# $2 The tty ttyS1
-# $3 The link speed 38400
-# $4 Local IP number 12.34.56.78
-# $5 Peer IP number 12.34.56.99
-# $6 Optional ``ipparam'' value foo
+# Arg Name Example
+# $1 Interface name ppp0
+# $2 The tty ttyS1
+# $3 The link speed 38400
+# $4 Local IP number 12.34.56.78
+# $5 Peer IP number 12.34.56.99
+# $6 Optional ``ipparam'' value foo
set +e
-# The environment is cleared before executing this script
+# The environment is cleared before executing this script
# so the path must be reset
PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
export PATH
@@ -29,8 +29,8 @@
PPP_IPPARAM="$6"
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
+. /etc/rc.d/init.d/functions
+. /etc/sysconfig/network-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
Modified: rc-scripts/trunk/ppp/ipx-down
==============================================================================
--- rc-scripts/trunk/ppp/ipx-down (original)
+++ rc-scripts/trunk/ppp/ipx-down Wed Oct 26 18:33:29 2005
@@ -6,23 +6,23 @@
# This script is run by the pppd after the link is established.
#
# This script is called with the following arguments:
-# Arg Name Example
-# $1 Interface name ppp0
-# $2 The tty ttyS1
-# $3 The link speed 38400
-# $4 The network number ???
-# $5 Local IPX node address ???
-# $6 Remote IPX node address ???
-# $7 Local IPX routing protocol ???
-# $8 Remote IPX routing protocol ???
-# $9 Local IPX router name ???
-# $10 Remote IPX router name ???
-# $11 Optional ``ipparam'' value foo
-# $12 PPPD pid 1276
+# Arg Name Example
+# $1 Interface name ppp0
+# $2 The tty ttyS1
+# $3 The link speed 38400
+# $4 The network number ???
+# $5 Local IPX node address ???
+# $6 Remote IPX node address ???
+# $7 Local IPX routing protocol ???
+# $8 Remote IPX routing protocol ???
+# $9 Local IPX router name ???
+# $10 Remote IPX router name ???
+# $11 Optional ``ipparam'' value foo
+# $12 PPPD pid 1276
set +e
-# The environment is cleared before executing this script
+# The environment is cleared before executing this script
# so the path must be reset
PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
export PATH
@@ -45,7 +45,7 @@
export PPP_IPPARAM PPP_PID
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /etc/sysconfig/network-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
@@ -55,7 +55,7 @@
export PPP_TTYNAME
# Main Script starts here
-[ -x /etc/ppp/ipx-down.local ] && /etc/ppp/ipx-down.local
+[ -x /etc/ppp/ipx-down.local ] && /etc/ppp/ipx-down.local
run-parts /etc/sysconfig/interfaces/down.d/ipx
Modified: rc-scripts/trunk/ppp/ipx-up
==============================================================================
--- rc-scripts/trunk/ppp/ipx-up (original)
+++ rc-scripts/trunk/ppp/ipx-up Wed Oct 26 18:33:29 2005
@@ -11,23 +11,23 @@
# after that package), so choose local script names with that in mind.
#
# This script is called with the following arguments:
-# Arg Name Example
-# $1 Interface name ppp0
-# $2 The tty ttyS1
-# $3 The link speed 38400
-# $4 The network number ???
-# $5 Local IPX node address ???
-# $6 Remote IPX node address ???
-# $7 Local IPX routing protocol ???
-# $8 Remote IPX routing protocol ???
-# $9 Local IPX router name ???
-# $10 Remote IPX router name ???
-# $11 Optional ``ipparam'' value foo
-# $12 PPPD pid 1276
+# Arg Name Example
+# $1 Interface name ppp0
+# $2 The tty ttyS1
+# $3 The link speed 38400
+# $4 The network number ???
+# $5 Local IPX node address ???
+# $6 Remote IPX node address ???
+# $7 Local IPX routing protocol ???
+# $8 Remote IPX routing protocol ???
+# $9 Local IPX router name ???
+# $10 Remote IPX router name ???
+# $11 Optional ``ipparam'' value foo
+# $12 PPPD pid 1276
set +e
-# The environment is cleared before executing this script
+# The environment is cleared before executing this script
# so the path must be reset
PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
export PATH
@@ -50,7 +50,7 @@
export PPP_IPPARAM PPP_PID
. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
+. /etc/sysconfig/network-scripts/functions.network
CONFIG="$PPP_IPPARAM"
source_config
@@ -60,7 +60,7 @@
export PPP_TTYNAME
# Main Script starts here
-[ -x /etc/ppp/ipx-up.local ] && /etc/ppp/ipx-up.local
+[ -x /etc/ppp/ipx-up.local ] && /etc/ppp/ipx-up.local
run-parts /etc/sysconfig/interfaces/up.d/ipx
Modified: rc-scripts/trunk/rc.d/init.d/allowlogin
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/allowlogin (original)
+++ rc-scripts/trunk/rc.d/init.d/allowlogin Wed Oct 26 18:33:29 2005
@@ -22,21 +22,21 @@
if is_yes "$DELAY_LOGIN" && [ -f /etc/nologin.boot ]; then
run_cmd "Allowing users to login" rm -f /etc/nologin /etc/nologin.boot
fi
- ;;
+ ;;
stop)
# /etc/nologin when shutting down system
if is_yes "$DELAY_LOGIN" && [ ! -f /etc/nologin ]; then
- nls "System shutdown in progress \n" > /etc/nologin
- chmod 644 /etc/nologin
- cp -fp /etc/nologin /etc/nologin.boot
+ nls "System shutdown in progress \n" > /etc/nologin
+ chmod 644 /etc/nologin
+ cp -fp /etc/nologin /etc/nologin.boot
fi
- ;;
+ ;;
*)
- echo "Usage: $0 {start|stop}"
- exit 1
+ echo "Usage: $0 {start|stop}"
+ exit 1
esac
exit 0
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/cpusets
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/cpusets (original)
+++ rc-scripts/trunk/rc.d/init.d/cpusets Wed Oct 26 18:33:29 2005
@@ -2,8 +2,8 @@
#
# cpusets Create/remove cpusets
#
-# chkconfig: 12345 01 99
-# description: Creates/Removes all cpu sets configured to \
+# chkconfig: 12345 01 99
+# description: Creates/Removes all cpu sets configured to \
# start at boot time.
#
# probe: true
@@ -19,54 +19,54 @@
. /etc/rc.d/init.d/functions
if is_yes "${CPUSETS}" ; then
- if ! grep -q "/dev/cpuset" /proc/mounts ; then
- nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2
- fi
+ if ! grep -q "/dev/cpuset" /proc/mounts ; then
+ nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2
+ fi
else
- exit 0
+ exit 0
fi
cpuset_create()
{
- local CPUS MEMS CPU_EXCLUSIVE MEM_EXCLUSIVE NOTIFY_ON_RELEASE TASKS
+ local CPUS MEMS CPU_EXCLUSIVE MEM_EXCLUSIVE NOTIFY_ON_RELEASE TASKS
- . /etc/sysconfig/cpusets/cpuset-$i
+ . /etc/sysconfig/cpusets/cpuset-$i
- if mkdir /dev/cpuset/"$NAME" >/dev/null 2>&1 ; then
- [ -n "$CPUS" ] && echo "$CPUS" >/dev/cpuset/"$NAME"/cpus
- [ -n "$MEMS" ] && echo "$MEMS" >/dev/cpuset/"$NAME"/mems
- [ -n "$CPU_EXCLUSIVE" ] && echo "$CPU_EXCLUSIVE" >/dev/cpuset/"$NAME"/cpu_exclusive
- [ -n "$MEM_EXCLUSIVE" ] && echo "$MEM_EXCLUSIVE" >/dev/cpuset/"$NAME"/mem_exclusive
- [ -n "$NOTIFY_ON_RELEASE" ] && echo "$NOTIFY_ON_RELEASE" >/dev/cpuset/"$NAME"/notify_on_release
- [ -n "$TASKS" ] && echo "$TASKS" >/dev/cpuset/"$NAME"/tasks
- return 0
- fi
- return 1
+ if mkdir /dev/cpuset/"$NAME" >/dev/null 2>&1 ; then
+ [ -n "$CPUS" ] && echo "$CPUS" >/dev/cpuset/"$NAME"/cpus
+ [ -n "$MEMS" ] && echo "$MEMS" >/dev/cpuset/"$NAME"/mems
+ [ -n "$CPU_EXCLUSIVE" ] && echo "$CPU_EXCLUSIVE" >/dev/cpuset/"$NAME"/cpu_exclusive
+ [ -n "$MEM_EXCLUSIVE" ] && echo "$MEM_EXCLUSIVE" >/dev/cpuset/"$NAME"/mem_exclusive
+ [ -n "$NOTIFY_ON_RELEASE" ] && echo "$NOTIFY_ON_RELEASE" >/dev/cpuset/"$NAME"/notify_on_release
+ [ -n "$TASKS" ] && echo "$TASKS" >/dev/cpuset/"$NAME"/tasks
+ return 0
+ fi
+ return 1
}
cpuset_remove()
{
- local CPUS MEMS CPU_EXCLUSIVE MEM_EXCLUSIVE NOTIFY_ON_RELEASE TASKS
+ local CPUS MEMS CPU_EXCLUSIVE MEM_EXCLUSIVE NOTIFY_ON_RELEASE TASKS
- . /etc/sysconfig/cpusets/cpuset-$i
+ . /etc/sysconfig/cpusets/cpuset-$i
- # This MUST be rmdir (not rm -rf)
- if rmdir /dev/cpuset/"$NAME" >/dev/null 2>&1 ; then
- return 0
- else
- return 1
- fi
+ # This MUST be rmdir (not rm -rf)
+ if rmdir /dev/cpuset/"$NAME" >/dev/null 2>&1 ; then
+ return 0
+ else
+ return 1
+ fi
}
cpuset_empty()
{
- if [ $(cat /dev/cpuset/$1/tasks 2>/dev/null | wc -c) -eq 0 ] ; then
- # true returns zero
- return 0
- else
- # false returns one
- return 1
- fi
+ if [ $(cat /dev/cpuset/$1/tasks 2>/dev/null | wc -c) -eq 0 ] ; then
+ # true returns zero
+ return 0
+ else
+ # false returns one
+ return 1
+ fi
}
# find all the interfaces besides loopback.
@@ -76,7 +76,7 @@
cd /etc/sysconfig/cpusets && ls -1 cpuset* | \
egrep 'cpuset-[a-z0-9\.:]+$' | \
for i in `cat`; do \
- ONBOOT=""; . /etc/sysconfig/cpusets/"$i"; is_yes "$ONBOOT" && echo "$i"; \
+ ONBOOT=""; . /etc/sysconfig/cpusets/"$i"; is_yes "$ONBOOT" && echo "$i"; \
done | \
awk ' { gsub(/cpuset-/,NIL); print $0 } ') 2> /dev/null)
@@ -88,47 +88,47 @@
for i in $cpusets_boot ; do
show "$(nls -n "Creating cpuset %s" "$i")"
if cpuset_create $i ; then
- ok
+ ok
else
- fail
+ fail
fi
done
- touch /var/lock/subsys/cpusets
- ;;
+ touch /var/lock/subsys/cpusets
+ ;;
stop)
for i in $cpusets_boot ; do
show "$(nls -n "Removing cpuset %s" "$i")"
busy
if cpuset_empty $i ; then
- if cpuset_remove $i ; then
- ok
- else
- fail
- fi
+ if cpuset_remove $i ; then
+ ok
+ else
+ fail
+ fi
else
- fail
+ fail
fi
done
- rm -f /var/lock/subsys/cpusets
- ;;
+ rm -f /var/lock/subsys/cpusets
+ ;;
status)
nls "Configured cpusets:"
echo "$cpusets_boot"
echo
nls "Currently empty cpusets:"
for i in `ls -1 /dev/cpuset` ; do
- if [ -d /dev/cpuset/$i ] ; then
- cpuset_empty $i && echo $i
- fi
+ if [ -d /dev/cpuset/$i ] ; then
+ cpuset_empty $i && echo $i
+ fi
done
echo
nls "Currently active cpusets:"
for i in `ls -1 /dev/cpuset` ; do
- if [ -d /dev/cpuset/$i ] ; then
- cpuset_empty $i || echo $i
- fi
+ if [ -d /dev/cpuset/$i ] ; then
+ cpuset_empty $i || echo $i
+ fi
done
echo
;;
@@ -137,11 +137,11 @@
$0 start
;;
*)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
esac
exit 0
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions (original)
+++ rc-scripts/trunk/rc.d/init.d/functions Wed Oct 26 18:33:29 2005
@@ -113,15 +113,15 @@
RESULT=0
while [ "$1" != "${1##-}" ] || [ "$1" != "${1##+}" ]; do
case $1 in
- -c)
- shift
- $1
- RESULT=$?
- break
- ;;
- *)
- shift
- ;;
+ -c)
+ shift
+ $1
+ RESULT=$?
+ break
+ ;;
+ *)
+ shift
+ ;;
esac
done
return $RESULT
@@ -312,7 +312,7 @@
echo -n "$INIT_DOTS"
termput hpa 0
if [ -n "$CHARS" ]; then
- termput setaf $CCHARS
+ termput setaf $CCHARS
echo -n "$CHARS"
termput op
fi
@@ -321,7 +321,7 @@
else
text=$(nls "$@")
if [ -n "$CHARS" ]; then
- termput setaf $CCHARS
+ termput setaf $CCHARS
echo -n "$CHARS"
termput op
fi
@@ -398,7 +398,7 @@
echo $@
return
fi
- good_pids=""
+ good_pids=""
for root_pid in $@; do
root_dir=$(resolvesymlink /proc/${root_pid}/root)
if [ -n "$root_dir" ]; then
@@ -554,20 +554,20 @@
while [ "$1" != "${1##-}" ] || [ "$1" != "${1##+}" ]; do
case $1 in
- --pidfile)
- shift
- pidfile="$1"
- shift
+ --pidfile)
+ shift
+ pidfile="$1"
+ shift
;;
- --waitforname)
- shift
- waitname="$1"
- shift
- ;;
- --waitfortime)
- shift
- waittime="$1"
- shift
+ --waitforname)
+ shift
+ waitname="$1"
+ shift
+ ;;
+ --waitfortime)
+ shift
+ waittime="$1"
+ shift
;;
esac
done
@@ -638,7 +638,7 @@
log_failed "$1 shutdown"
result=7
fi
-
+
if [ -n "$waitname" -a -n "$waittime" ]; then
# Save basename.
base=$(basename "$waitname")
@@ -726,8 +726,8 @@
# else
# pid=`ps ax | awk 'BEGIN { prog=ARGV[1]; ARGC=1 }
# { if ((prog == $5) || (("(" prog ")") == $5) ||
-# (("[" prog "]") == $5) ||
-# ((prog ":") == $5)) { print $1 ; exit 0 } }' $1`
+# (("[" prog "]") == $5) ||
+# ((prog ":") == $5)) { print $1 ; exit 0 } }' $1`
# if [ "$pid" != "" ]; then
# cpuset_msg="..."
# if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then
@@ -877,11 +877,11 @@
*** Relabeling could take a very long time, ***
*** depending on file system size. ***
"
- echo "0" > $selinuxfs/enforce
- /sbin/fixfiles -F relabel > /dev/null 2>&1
- rm -f /.autorelabel
- echo "*** Enabling security enforcement. ***"
- echo $SELINUX > $selinuxfs/enforce
+ echo "0" > $selinuxfs/enforce
+ /sbin/fixfiles -F relabel > /dev/null 2>&1
+ rm -f /.autorelabel
+ echo "*** Enabling security enforcement. ***"
+ echo $SELINUX > $selinuxfs/enforce
}
#/*
@@ -891,4 +891,4 @@
# * End:
# *
# */
-# vi: syntax=sh:shiftwidth=8:
+# vi: syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/killall
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/killall (original)
+++ rc-scripts/trunk/rc.d/init.d/killall Wed Oct 26 18:33:29 2005
@@ -1,25 +1,25 @@
#!/bin/sh
-#
-# killall Script for system downing
#
-# description: kill em all
+# killall Script for system downing
+#
+# description: kill em all
#
# $Id$
-# Bring down all unneeded services that are still running (there shouldn't
+# Bring down all unneeded services that are still running (there shouldn't
# be any, so this is just a sanity check)
case "$1" in
start*)
- exit 0
- ;;
+ exit 0
+ ;;
stop*)
for i in /var/lock/subsys/*; do
# Check if the script is there.
[ ! -f $i ] && continue
-
+
# Get the subsystem name.
subsys=${i#/var/lock/subsys/}
-
+
# Bring the subsystem down.
if [ -f /etc/rc.d/init.d/$subsys.init ]; then
/etc/rc.d/init.d/$subsys.init stop
@@ -31,4 +31,4 @@
esac
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
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 Wed Oct 26 18:33:29 2005
@@ -2,8 +2,8 @@
#
# network Bring up/down networking
#
-# chkconfig: 2345 10 90
-# description: Activates/Deactivates all network interfaces configured to \
+# chkconfig: 2345 10 90
+# description: Activates/Deactivates all network interfaces configured to \
# start at boot time.
#
# probe: true
@@ -125,8 +125,8 @@
egrep 'BOOTPRIO' ifcfg* | sort -t= -n -k2,2 | \
awk ' { gsub(/:BOOTPRIO.*/,NIL); print $0 } '| egrep -v 'ifcfg-lo' | \
for i in `cat`; do \
- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" &&
- echo "$i"; \
+ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
+ is_yes "$ONBOOT" && echo "$i"; \
done | \
awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
else
@@ -136,7 +136,8 @@
egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \
LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \
for i in `cat`; do \
- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \
+ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
+ is_yes "$ONBOOT" && echo "$i"; \
done | \
awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
interfaces_vlan_boot=$((
@@ -145,7 +146,8 @@
egrep 'ifcfg-(.*)\.(.*)' | \
LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \
for i in `cat`; do \
- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \
+ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
+ is_yes "$ONBOOT" && echo "$i"; \
done | \
awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
interfaces_br_boot=$((
@@ -153,7 +155,8 @@
cd /etc/sysconfig/interfaces && ls -1 ifcfg-br* | \
LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \
for i in `cat`; do \
- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \
+ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
+ is_yes "$ONBOOT" && echo "$i"; \
done | \
awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
interfaces_sit_boot=$((
@@ -161,7 +164,8 @@
cd /etc/sysconfig/interfaces && ls -1 ifcfg-sit* | \
LC_ALL=C egrep 'ifcfg-[a-z0-9]+$' | \
for i in `cat`; do \
- ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \
+ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
+ is_yes "$ONBOOT" && echo "$i"; \
done | \
awk ' { gsub(/ifcfg-/,NIL); print $0 } ') 2> /dev/null)
fi
@@ -173,19 +177,19 @@
# See how we were called.
case "$1" in
start)
- rc_splash "bootnetwork start"
+ rc_splash "bootnetwork start"
- if is_yes "$VSERVER"; then
+ if is_yes "$VSERVER"; then
touch /var/lock/subsys/network
exit 0
fi
-
+
network_init
for i in $interfaces_boot $interfaces_vlan_boot $interfaces_sit_boot ; do
run_cmd -a "$(nls 'Bringing up interface %s' "$i")" /sbin/ifup $i boot
done
-
+
for i in $interfaces_br_boot ; do
run_cmd -a "$(nls 'Bringing up bridge interface %s' "$i")" /sbin/ifup $i boot
done
@@ -197,10 +201,10 @@
network_postinit
- touch /var/lock/subsys/network
- ;;
+ touch /var/lock/subsys/network
+ ;;
stop)
- # If we go to runlevel 0, 1 or 6 then umount all network fs
+ # If we go to runlevel 0, 1 or 6 then umount all network fs
if [ "$RUNLEVEL" = "6" -o "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" ]; then
if [ -x /etc/rc.d/init.d/netfs -a -f /var/lock/subsys/netfs ];
then
@@ -208,16 +212,16 @@
else
netmtab=$(awk '{ if ($3 ~ /^(nfs|smbfs|ncpfs|cifs)$/ ) print $3}' /proc/mounts)
if (echo "$netmtab" | grep -q nfs); then
- run_cmd "Unmounting NFS filesystems" umount -fat nfs
+ run_cmd "Unmounting NFS filesystems" umount -fat nfs
fi
if (echo "$netmtab" | grep -q smbfs); then
- run_cmd "Unmounting SMB filesystems" umount -at smbfs
+ run_cmd "Unmounting SMB filesystems" umount -at smbfs
fi
if (echo "$netmtab" | grep -q ncpfs); then
- run_cmd "Unmounting NCP filesystems" umount -at ncpfs
+ run_cmd "Unmounting NCP filesystems" umount -at ncpfs
fi
if (echo "$netmtab" | grep -q cifs); then
- run_cmd "Unmounting CIFS filesystems" umount -at cifs
+ run_cmd "Unmounting CIFS filesystems" umount -at cifs
fi
fi
fi
@@ -242,8 +246,8 @@
network_deinit
- rm -f /var/lock/subsys/network
- ;;
+ rm -f /var/lock/subsys/network
+ ;;
status)
nls "Configured devices:"
echo "lo $interfaces"
@@ -260,11 +264,11 @@
$0 start
;;
*)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
esac
exit 0
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/random
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/random (original)
+++ rc-scripts/trunk/rc.d/init.d/random Wed Oct 26 18:33:29 2005
@@ -43,7 +43,7 @@
touch $random_seed
chmod 600 $random_seed
dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null
-
+
rm -f /var/lock/subsys/random
deltext
ok
@@ -70,4 +70,4 @@
exit 0
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/single
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/single (original)
+++ rc-scripts/trunk/rc.d/init.d/single Wed Oct 26 18:33:29 2005
@@ -11,7 +11,7 @@
# Author: Miquel van Smoorenburg, <miquels at drinkel.nl.mugnet.org>
# Changes: Grzegorz Stanislawski <stangrze at open.net.pl>
# Arkadiusz Miśkiewicz <misiek at pld-linux.org>
-#
+#
# $Id$
# Set the path.
@@ -23,10 +23,10 @@
. /etc/rc.d/init.d/functions
case "$1" in
- stop*)
+ stop*)
exit 0
;;
- start*)
+ start*)
# Kill all processes.
[ "${BASH+bash}" = bash ] && enable kill
@@ -46,15 +46,15 @@
# If they want to run something in single user mode, might as well run it...
for i in /etc/rc.d/rc1.d/S[0-9][0-9]*; do
- # Check if the script is there.
- [ ! -f $i ] && continue
+ # Check if the script is there.
+ [ ! -f $i ] && continue
- # Don't run [KS]??foo.{rpmsave,rpmorig} scripts
- [ "${i%.rpmsave}" != "${i}" ] && continue
- [ "${i%.rpmorig}" != "${i}" ] && continue
- [ "${i%.rpmnew}" != "${i}" ] && continue
- [ "$i" = "/etc/rc.d/rc1.d/S00single" ] && continue
- $i start
+ # Don't run [KS]??foo.{rpmsave,rpmorig} scripts
+ [ "${i%.rpmsave}" != "${i}" ] && continue
+ [ "${i%.rpmorig}" != "${i}" ] && continue
+ [ "${i%.rpmnew}" != "${i}" ] && continue
+ [ "$i" = "/etc/rc.d/rc1.d/S00single" ] && continue
+ $i start
done
# Now go to the single user level.
@@ -64,4 +64,4 @@
esac
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/sys-chroots
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/sys-chroots (original)
+++ rc-scripts/trunk/rc.d/init.d/sys-chroots Wed Oct 26 18:33:29 2005
@@ -31,94 +31,93 @@
start)
# Start daemons.
if [ "$previous" = "N" ]; then
- runlevel=5
- previous=0
- export runlevel previous
- fi
-
+ runlevel=5
+ previous=0
+ export runlevel previous
+ fi
+
if [ ! -f /var/lock/subsys/sys-chroots ]; then
msg_starting "System chroots services"; started
for dir in $SYSTEM_CHROOTS; do
- [ ! -x "$dir/etc/rc.d/rc" ] && continue
- msg_starting "System chroots services for $dir"; started
+ [ ! -x "$dir/etc/rc.d/rc" ] && continue
+ msg_starting "System chroots services for $dir"; started
- # Cleaning part, keep in sync with rc.sysinit
+ # Cleaning part, keep in sync with rc.sysinit
- chroot $dir /bin/sh -c '
- . /etc/rc.d/init.d/functions
- . /etc/sysconfig/system
-
- # Clear mtab
- :>/etc/mtab
- [ -f /etc/cryptomtab ] && :>/etc/cryptomtab
-
- # Remove stale backups
- rm -f /etc/mtab~ /etc/mtab~~ /etc/cryptomtab~ /etc/cryptomtab~~
-
- # Clean up /var
- # I would d use find, but /usr may not be mounted.
- for afile in /var/lock/* /var/run/*; do
- bafile=$(basename $afile)
- if [ -d "$afile" ]; then
- [ "$bafile" != "news" -a "$bafile" != "sudo" -a "$bafile" != "mon" ] && rm -rf $afile/*
+ chroot $dir /bin/sh -c '
+ . /etc/rc.d/init.d/functions
+ . /etc/sysconfig/system
+ # Clear mtab
+ :>/etc/mtab
+ [ -f /etc/cryptomtab ] && :>/etc/cryptomtab
+
+ # Remove stale backups
+ rm -f /etc/mtab~ /etc/mtab~~ /etc/cryptomtab~ /etc/cryptomtab~~
+
+ # Clean up /var
+ # I would d use find, but /usr may not be mounted.
+ for afile in /var/lock/* /var/run/*; do
+ bafile=$(basename $afile)
+ if [ -d "$afile" ]; then
+ [ "$bafile" != "news" -a "$bafile" != "sudo" -a "$bafile" != "mon" ] && rm -rf $afile/*
+ else
+ [ "$bafile" != "hwprofile" ] && rm -f $afile 2> /dev/null
+ fi
+ done
+ # Delete stale files
+ rm -f /var/lib/rpm/__db* /var/spool/postoffice/.pid.* /tmp/.X*-lock \
+ /tmp/.lock.* /tmp/.gdm_socket /tmp/.s.PGSQL.*
+ rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \
+ /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-* \
+ /tmp/scrollkeeper-* /tmp/ssh-*
+
+ # Clean up utmp/wtmp
+ if ! is_no "$NEED_XFILES" ; then
+ :>/var/run/utmpx
+ touch /var/log/wtmpx
+ chown root.utmp /var/run/utmpx /var/log/wtmpx
+ chmod 0664 /var/run/utmpx /var/log/wtmpx
else
- [ "$bafile" != "hwprofile" ] && rm -f $afile 2> /dev/null
+ :>/var/run/utmp
+ touch /var/log/wtmp
+ chown root.utmp /var/run/utmp /var/log/wtmp
+ chmod 0664 /var/run/utmp /var/log/wtmp
+ fi
+ # Clean /tmp
+ if is_yes "$CLEAN_TMP"; then
+ rm -rf /tmp/* /tmp/.[a-zA-Z0-9]*
+ fi
+ '
+
+ # Do our things
+
+ # proc
+ chroot $dir mount -o gid=17 -t proc proc /proc
+ # usbfs, if available
+ if [ -f /proc/bus/usb/devices ]; then
+ chroot $dir mount -t usbfs usbfs /proc/bus/usb
fi
- done
- # Delete stale files
- rm -f /var/lib/rpm/__db* /var/spool/postoffice/.pid.* /tmp/.X*-lock \
- /tmp/.lock.* /tmp/.gdm_socket /tmp/.s.PGSQL.*
- rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \
- /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-* \
- /tmp/scrollkeeper-* /tmp/ssh-*
-
- # Clean up utmp/wtmp
- if ! is_no "$NEED_XFILES" ; then
- :>/var/run/utmpx
- touch /var/log/wtmpx
- chown root.utmp /var/run/utmpx /var/log/wtmpx
- chmod 0664 /var/run/utmpx /var/log/wtmpx
- else
- :>/var/run/utmp
- touch /var/log/wtmp
- chown root.utmp /var/run/utmp /var/log/wtmp
- chmod 0664 /var/run/utmp /var/log/wtmp
- fi
- # Clean /tmp
- if is_yes "$CLEAN_TMP"; then
- rm -rf /tmp/* /tmp/.[a-zA-Z0-9]*
- fi
- '
-
- # Do our things
-
- # proc
- chroot $dir mount -o gid=17 -t proc proc /proc
- # usbfs, if available
- if [ -f /proc/bus/usb/devices ]; then
- chroot $dir mount -t usbfs usbfs /proc/bus/usb
- fi
- # sysfs is also needed before any other things (under kernel > 2.5)
- if grep -q sysfs /proc/filesystems ; then
- chroot $dir mount -o gid=17 -t sysfs sysfs /sys
- fi
- # selinux
- if grep -q selinuxfs /proc/filesystems ; then
- chroot $dir mount -o gid=17 -t selinuxfs selinuxfs /selinux
- fi
- chroot $dir mount -a
- # network
- chroot $dir /sbin/chkconfig network off
- rm -f $dir/etc/rc.d/rc*.d/K*network
- [ -f /var/lock/subsys/network ] && touch $dir/var/lock/subsys/network
- # other
- chroot $dir /sbin/chkconfig single off
- rm -f $dir/etc/rc.d/rc*.d/K*single
- # run it
- chroot $dir /etc/rc.d/rc $runlevel chroot
+ # sysfs is also needed before any other things (under kernel > 2.5)
+ if grep -q sysfs /proc/filesystems ; then
+ chroot $dir mount -o gid=17 -t sysfs sysfs /sys
+ fi
+ # selinux
+ if grep -q selinuxfs /proc/filesystems ; then
+ chroot $dir mount -o gid=17 -t selinuxfs selinuxfs /selinux
+ fi
+ chroot $dir mount -a
+ # network
+ chroot $dir /sbin/chkconfig network off
+ rm -f $dir/etc/rc.d/rc*.d/K*network
+ [ -f /var/lock/subsys/network ] && touch $dir/var/lock/subsys/network
+ # other
+ chroot $dir /sbin/chkconfig single off
+ rm -f $dir/etc/rc.d/rc*.d/K*single
+ # run it
+ chroot $dir /etc/rc.d/rc $runlevel chroot
done
-
+
touch /var/lock/subsys/sys-chroots
else
msg_already_running "System chroots services"
@@ -127,27 +126,27 @@
stop)
# Stop daemons.
if [ "$previous" = "N" ]; then
- runlevel=0
- previous=5
- export runlevel previous
+ runlevel=0
+ previous=5
+ export runlevel previous
fi
-
+
if [ -f /var/lock/subsys/sys-chroots ]; then
msg_stopping "System chroots services"; started
for dir in $SYSTEM_CHROOTS; do
- [ ! -x "$dir/etc/rc.d/rc" ] && continue
- msg_stopping "System chroots services for $dir"; started
- chroot $dir /etc/rc.d/rc $runlevel chroot
- rm -f $dir/var/lock/subsys/network
- chroot $dir /bin/sh -c "grep -q selinuxfs /proc/filesystems && umount /selinux"
- chroot $dir /bin/sh -c "grep -q sysfs /proc/filesystems && umount /sys"
- chroot $dir umount -a
- chroot $dir umount /proc
+ [ ! -x "$dir/etc/rc.d/rc" ] && continue
+ msg_stopping "System chroots services for $dir"; started
+ chroot $dir /etc/rc.d/rc $runlevel chroot
+ rm -f $dir/var/lock/subsys/network
+ chroot $dir /bin/sh -c "grep -q selinuxfs /proc/filesystems && umount /selinux"
+ chroot $dir /bin/sh -c "grep -q sysfs /proc/filesystems && umount /sys"
+ chroot $dir umount -a
+ chroot $dir umount /proc
done
rm -f /var/lock/subsys/sys-chroots >/dev/null 2>&1
else
msg_not_running "System chroots services"
- fi
+ fi
;;
restart)
$0 stop
@@ -155,10 +154,10 @@
exit $?
;;
status)
- # TODO: running each service with status parameter
- for dir in $SYSTEM_CHROOTS; do
- echo "System chroots services for $dir"
- chroot $dir /sbin/chkconfig --list
+ # TODO: running each service with status parameter
+ for dir in $SYSTEM_CHROOTS; do
+ echo "System chroots services for $dir"
+ chroot $dir /sbin/chkconfig --list
done
exit $?
;;
@@ -168,3 +167,6 @@
esac
exit $RETVAL
+
+# This must be last line !
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/template.init
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/template.init (original)
+++ rc-scripts/trunk/rc.d/init.d/template.init Wed Oct 26 18:33:29 2005
@@ -102,4 +102,4 @@
exit $RETVAL
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/init.d/timezone
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/timezone (original)
+++ rc-scripts/trunk/rc.d/init.d/timezone Wed Oct 26 18:33:29 2005
@@ -19,11 +19,11 @@
ZONE_FILE="$ZONE_INFO_DIR"
if [ -n "$ZONE_INFO_SCHEME" -a "$ZONE_INFO_SCHEME" != "posix" ]; then
- ZONE_FILE="$ZONE_FILE/$ZONE_INFO_SCHEME"
+ ZONE_FILE="$ZONE_FILE/$ZONE_INFO_SCHEME"
fi
if [ -n "$ZONE_INFO_AREA" ]; then
- ZONE_FILE="$ZONE_FILE/$ZONE_INFO_AREA"
+ ZONE_FILE="$ZONE_FILE/$ZONE_INFO_AREA"
fi
ZONE_FILE="$ZONE_FILE/$TIME_ZONE"
@@ -33,31 +33,31 @@
# See how we were called.
case "$1" in
start)
- rm -f /etc/localtime
+ rm -f /etc/localtime
if [ -f "$ZONE_FILE" ]; then
if [ -n "$ZONE_INFO_AREA" ]; then
- MESSAGE="`nls 'Setting time zone information (%s, %s)' "$ZONE_INFO_AREA" "$TIME_ZONE"`"
+ MESSAGE="`nls 'Setting time zone information (%s, %s)' "$ZONE_INFO_AREA" "$TIME_ZONE"`"
else
- MESSAGE="`nls 'Setting time zone information (%s)' "$TIME_ZONE"`"
+ MESSAGE="`nls 'Setting time zone information (%s)' "$TIME_ZONE"`"
fi
run_cmd "$MESSAGE" cp -af $ZONE_FILE /etc/localtime
RETVAL=$?
fi
- ;;
+ ;;
stop)
- run_cmd "Unsetting time zone information" rm -f /etc/localtime
- RETVAL=$?
- ;;
+ run_cmd "Unsetting time zone information" rm -f /etc/localtime
+ RETVAL=$?
+ ;;
restart)
- $0 stop
- $0 start
- ;;
+ $0 stop
+ $0 start
+ ;;
reload)
- $0 restart
- ;;
+ $0 restart
+ ;;
*)
- echo "Usage: $0 {start|stop|restart|reload}"
- exit 1
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
esac
unset ZONE_FILE ZONE_INFO_DIR ZONE_INFO_SCHEME ZONE_INFO_AREA TIME_ZONE MESSAGE
@@ -65,4 +65,4 @@
exit $RETVAL
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/rc
==============================================================================
--- rc-scripts/trunk/rc.d/rc (original)
+++ rc-scripts/trunk/rc.d/rc Wed Oct 26 18:33:29 2005
@@ -1,15 +1,15 @@
#!/bin/sh
#
-# rc This file is responsible for starting/stopping
-# services when the runlevel changes. It is also
-# responsible for the very first setup of basic
-# things, such as setting the hostname.
+# rc This file is responsible for starting/stopping
+# services when the runlevel changes. It is also
+# responsible for the very first setup of basic
+# things, such as setting the hostname.
#
# $Id$
#
-# Original Author:
-# Miquel van Smoorenburg, <miquels at drinkel.nl.mugnet.org>
-# Changes: Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Original Author:
+# Miquel van Smoorenburg, <miquels at drinkel.nl.mugnet.org>
+# Changes: Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# avoid being interrupted by child or keyboard
@@ -30,20 +30,20 @@
COLUMNS=
fi
export LINES COLUMNS CONSOLE
-
+
# NLS
if [ -f /etc/sysconfig/i18n ]; then
- . /etc/sysconfig/i18n
- [ -n "$LANG" ] && export LANG || unset LANG
- [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
- [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
- [ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
- [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
- [ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
- [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
- [ -n "$LC_ALL" ] && export LC_ALL || unset LC_ALL
- [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
- [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
+ . /etc/sysconfig/i18n
+ [ -n "$LANG" ] && export LANG || unset LANG
+ [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
+ [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
+ [ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
+ [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
+ [ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
+ [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
+ [ -n "$LC_ALL" ] && export LC_ALL || unset LC_ALL
+ [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
+ [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
fi
# Read system config data.
@@ -64,11 +64,11 @@
. /etc/rc.d/init.d/functions
if [ "$argv2" != "chroot" ]; then
- # Now find out what the current and what the previous runlevel are.
- set $(/sbin/runlevel)
- runlevel=$2
- previous=$1
- export runlevel previous
+ # Now find out what the current and what the previous runlevel are.
+ set $(/sbin/runlevel)
+ runlevel=$2
+ previous=$1
+ export runlevel previous
fi
# Get first argument. Set new runlevel to this argument.
@@ -81,8 +81,8 @@
[ -d /var/run -a -w /var/run ] && echo "/etc/rc.d/rc$runlevel.d" > /var/run/runlevel.dir
# if runlevel is 0 (halt) or 6 (reboot) change to first
-# virtual console, and send messages to /dev/console
-# (it can be serial console too)
+# virtual console, and send messages to /dev/console
+# (it can be serial console too)
if [ "$COLUMNS" -gt 0 ]; then
if [ "$argv2" != "chroot" ] && ! is_yes "$VSERVER" && \
[ "$runlevel" = "0" -o "$runlevel" = "6" ]; then
@@ -114,8 +114,8 @@
for i in /etc/rc.d/rc$runlevel.d/S*; do
[ ! -f $i ] && continue
[ "${1%.rpmsave}" != "${1}" ] && continue
- [ "${1%.rpmorig}" != "${1}" ] && continue
- [ "${1%.rpmnew}" != "${1}" ] && continue
+ [ "${1%.rpmorig}" != "${1}" ] && continue
+ [ "${1%.rpmnew}" != "${1}" ] && continue
subsys=${i#/etc/rc.d/rc$runlevel.d/S??}
[ -f /var/lock/subsys/$subsys ] && \
[ ! -f /var/lock/subsys/${subsys}.init ] && continue
@@ -125,14 +125,14 @@
if test "$previous" != "N" ; then
kscripts=0
- for i in /etc/rc.d/rc$runlevel.d/K*; do
- [ ! -f $i ] && continue
- [ "${1%.rpmsave}" != "${1}" ] && continue
- [ "${1%.rpmorig}" != "${1}" ] && continue
- [ "${1%.rpmnew}" != "${1}" ] && continue
+ for i in /etc/rc.d/rc$runlevel.d/K*; do
+ [ ! -f $i ] && continue
+ [ "${1%.rpmsave}" != "${1}" ] && continue
+ [ "${1%.rpmorig}" != "${1}" ] && continue
+ [ "${1%.rpmnew}" != "${1}" ] && continue
subsys=${i#/etc/rc.d/rc$runlevel.d/K??}
- [ ! -f /var/lock/subsys/$subsys ] && \
- [ ! -f /var/lock/subsys/${subsys}.init ] && continue
+ [ ! -f /var/lock/subsys/$subsys ] && \
+ [ ! -f /var/lock/subsys/${subsys}.init ] && continue
kscripts=$(( kscripts + 1 ))
done
export kscripts
@@ -185,7 +185,7 @@
[ ! -f /var/lock/subsys/${subsys}.init ] && continue
rc_splash "$i stop"
-
+
# Bring the subsystem down.
$i stop
done
@@ -206,19 +206,19 @@
[ -f /var/lock/subsys/${subsys}.init ] && continue
# If we're in confirmation mode, get user confirmation
- [ -n "$CONFIRM" ] &&
+ [ -n "$CONFIRM" ] &&
{
confirm $subsys
case $? in
0)
:
- ;;
+ ;;
2)
CONFIRM=
- ;;
+ ;;
*)
continue
- ;;
+ ;;
esac
}
@@ -247,9 +247,9 @@
TMPDIR=/dev/null
export TMPDIR
if [ "$argv2" != "chroot" ]; then
- exec /etc/rc.d/rc.shutdown $runlevel $previous
+ exec /etc/rc.d/rc.shutdown $runlevel $previous
else
- exit 0
+ exit 0
fi
else
if is_yes "$RUN_LDCONFIG" || [ ! -f /etc/ld.so.cache ] ; then
Modified: rc-scripts/trunk/rc.d/rc.init
==============================================================================
--- rc-scripts/trunk/rc.d/rc.init (original)
+++ rc-scripts/trunk/rc.d/rc.init Wed Oct 26 18:33:29 2005
@@ -18,4 +18,4 @@
eval exec "$4"
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/rc.local
==============================================================================
--- rc-scripts/trunk/rc.d/rc.local (original)
+++ rc-scripts/trunk/rc.d/rc.local Wed Oct 26 18:33:29 2005
@@ -8,4 +8,4 @@
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/rc.modules
==============================================================================
--- rc-scripts/trunk/rc.d/rc.modules (original)
+++ rc-scripts/trunk/rc.d/rc.modules Wed Oct 26 18:33:29 2005
@@ -20,7 +20,9 @@
) | # make sure there is a LF at the end
while read module args
do
- [ -z "$module" ] && continue
- _modprobe single $module
+ [ -z "$module" ] && continue
+ _modprobe single $module
done
+# This must be last line !
+# vi:syntax=sh
Modified: rc-scripts/trunk/rc.d/rc.shutdown
==============================================================================
--- rc-scripts/trunk/rc.d/rc.shutdown (original)
+++ rc-scripts/trunk/rc.d/rc.shutdown Wed Oct 26 18:33:29 2005
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# shutdwn Common script for system halt/reboot.
+# shutdwn Common script for system halt/reboot.
#
-# Author: Miquel van Smoorenburg, <miquels at drinkel.nl.mugnet.org>
+# Author: Miquel van Smoorenburg, <miquels at drinkel.nl.mugnet.org>
# Changes: Grzegorz Stanislawski <stangrze at open.net.pl>
# Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
@@ -53,7 +53,7 @@
force=
remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm | iso9660 | ramfs | tmpfs | sysfs | squashfs |^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts)
while [ -n "$remaining" -a "$retry" -gt 0 ]
- do
+ do
show "Unmounting file systems" ; busy
if ERRORS=$(umount -a $FORCE -t noproc,devfs 2>&1) ; then
ok
@@ -61,7 +61,7 @@
fail
[ -n "$ERRORS" ] && echo "$ERRORS"
fi
-
+
sleep 2
remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm | iso9660 | ramfs | tmpfs | sysfs | squashfs |^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts)
[ -z "$remaining" ] && break
@@ -87,12 +87,12 @@
goraidtab=1
if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ]; then
if (grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf 2>/dev/null); then
- run_cmd "Turning off RAID devices" /sbin/mdadm --stop --scan
- rc=$?
- [ "$rc" -eq 0 ] && goraidtab=0
+ run_cmd "Turning off RAID devices" /sbin/mdadm --stop --scan
+ rc=$?
+ [ "$rc" -eq 0 ] && goraidtab=0
fi
fi
-
+
# turn off raid
if [ -x /sbin/raidstop -a -f /etc/raidtab -a "$goraidtab" -eq 1 ]; then
# we can not use raidstop -a here because this will only stop
@@ -111,7 +111,7 @@
show "Remounting remaining filesystems ro mode"; busy
if ( mount | awk '/ext2|ext3|reiserfs|xfs|jfs/ { print $3 }' | \
- while read line; do
+ while read line; do
mount -n -o ro,remount $line; done ); then
ok
else
@@ -120,12 +120,12 @@
fi
if [ "$runlevel" = "0" ] ; then
- show "The system is halted"; ok
+ show "The system is halted"; ok
[ -f /fastboot ] && (show "On the next boot fsck will be skipped."; ok)
if [ -x /sbin/poweroff-ups -a -f /etc/killpower -a -f /etc/sysconfig/ups ] ; then
- . /etc/sysconfig/ups
- is_yes "$POWEROFF_UPS" && /sbin/poweroff-ups
+ . /etc/sysconfig/ups
+ is_yes "$POWEROFF_UPS" && /sbin/poweroff-ups
fi
[ "$previous" != "unknown" ] && eval halt -d -p
else
Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit (original)
+++ rc-scripts/trunk/rc.d/rc.sysinit Wed Oct 26 18:33:29 2005
@@ -47,8 +47,8 @@
. /etc/sysconfig/system
else
RUN_SULOGIN_ON_ERR=yes
- RUN_USERPNP=yes
- RUN_KERNELPNP=yes
+ RUN_USERPNP=yes
+ RUN_KERNELPNP=yes
PANIC_REBOOT_TIME=0
DELAY_LOGIN=yes
CLEAN_TMP=no
@@ -62,12 +62,12 @@
# sysfs is also needed before any other things (under kernel > 2.5)
if ! is_yes "$VSERVER" && grep -q sysfs /proc/filesystems 2>/dev/null ; then
- mount -n -o gid=17 -t sysfs sysfs /sys
+ mount -n -o gid=17 -t sysfs sysfs /sys
fi
# selinux
if ! is_yes "$VSERVER" && grep -q selinuxfs /proc/filesystems 2>/dev/null && ! grep -q selinuxfs /proc/mounts 2>/dev/null; then
- mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
+ mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
fi
if [ $(kernelverser) = "002006" ]; then
@@ -86,12 +86,12 @@
# Choose Hardware profile
rm -f /var/run/hwprofile 2> /dev/null
if [ -f /etc/sysconfig/hwprof ]; then
- . /etc/sysconfig/hwprof
- if is_yes "${HWPROFILES}" && [ -x /sbin/hwprofile -a -d /etc/sysconfig/hwprofiles/data ]; then
- mount -n / -o rw,remount
- /sbin/hwprofile -qf
- mount -n / -o ro,remount
- fi
+ . /etc/sysconfig/hwprof
+ if is_yes "${HWPROFILES}" && [ -x /sbin/hwprofile -a -d /etc/sysconfig/hwprofiles/data ]; then
+ mount -n / -o rw,remount
+ /sbin/hwprofile -qf
+ mount -n / -o ro,remount
+ fi
fi
# Disable splash when requested
@@ -101,21 +101,21 @@
selinuxfs=$(awk '/ selinuxfs / { print $2 }' /proc/mounts)
SELINUX=
if [ -n "$selinuxfs" ] && [ "$(cat /proc/self/attr/current)" != "kernel" ]; then
- if [ -r $selinuxfs/enforce ] ; then
- SELINUX=$(cat $selinuxfs/enforce)
- else
- # assume enforcing if you can't read it
- SELINUX=1
- fi
+ if [ -r $selinuxfs/enforce ] ; then
+ SELINUX=$(cat $selinuxfs/enforce)
+ else
+ # assume enforcing if you can't read it
+ SELINUX=1
+ fi
fi
if [ -x /sbin/restorecon ] && LC_ALL=C fgrep -q " /dev " /proc/mounts 2>/dev/null ; then
- /sbin/restorecon -R /dev 2>/dev/null
+ /sbin/restorecon -R /dev 2>/dev/null
fi
if [ "$CONSOLETYPE" = "vt" -a -x /sbin/setsysfont ]; then
- run_cmd "Setting default font" /sbin/setsysfont
+ run_cmd "Setting default font" /sbin/setsysfont
fi
# Print welcome message
@@ -147,7 +147,7 @@
fi
[ -x /sbin/start_udev ] && run_cmd "Starting udev" /sbin/start_udev
-
+
# /dev must be also mounted before everything but only if we want use them ;-)
if is_yes "$MOUNT_DEVFS"; then
run_cmd "Mounting Device Filesystem" mount -n -t devfs /dev /dev
@@ -160,7 +160,7 @@
# cpuset support (mounted unconditionally, shouldn't be a problem)
if grep -q cpuset /proc/filesystems 2>/dev/null ; then
- mount -n -t cpuset none /dev/cpuset
+ mount -n -t cpuset none /dev/cpuset
fi
# Configure Linux kernel (initial configuration, some required modules still
@@ -245,15 +245,15 @@
if [ "$usb" = "1" ]; then
needusbstorage=$(LC_ALL=C cat /proc/bus/usb/devices 2>/dev/null|grep -e "^I.*Cls=08" 2>/dev/null)
if [ "$(kernelverser)" -lt "002006" ]; then
- LC_ALL=C grep -q 'hid' /proc/bus/usb/drivers 2>/dev/null || run_cmd "Initializing USB HID interface" modprobe hid 2> /dev/null
- mouseoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=02" 2>/dev/null)
- kbdoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=01" 2>/dev/null)
- if [ -n "$kbdoutput" ]; then
- run_cmd "Initializing USB keyboard" modprobe keybdev
- fi
- if [ -n "$mouseoutput" ]; then
- run_cmd "Initializing USB mouse" modprobe mousedev
- fi
+ LC_ALL=C grep -q 'hid' /proc/bus/usb/drivers 2>/dev/null || run_cmd "Initializing USB HID interface" modprobe hid 2> /dev/null
+ mouseoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=02" 2>/dev/null)
+ kbdoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=01" 2>/dev/null)
+ if [ -n "$kbdoutput" ]; then
+ run_cmd "Initializing USB keyboard" modprobe keybdev
+ fi
+ if [ -n "$mouseoutput" ]; then
+ run_cmd "Initializing USB mouse" modprobe mousedev
+ fi
fi
fi
@@ -281,7 +281,7 @@
_RUN_QUOTACHECK=0
_ROOTFS_TYPE=$(grep " / " /proc/mounts 2>/dev/null | awk '{ print $3 }')
- if [ -z "$fastboot" -a "$_ROOTFS_TYPE" != "nfs" -a "$_ROOTFS_TYPE" != "romfs" ]; then
+ if [ -z "$fastboot" -a "$_ROOTFS_TYPE" != "nfs" -a "$_ROOTFS_TYPE" != "romfs" ]; then
show "Checking root filesystem"; started
initlog -c "fsck -C -T -a $fsckoptions /"
@@ -329,14 +329,14 @@
# Unmount the initrd, if necessary
if LC_ALL=C grep -q /initrd /proc/mounts 2>/dev/null && ! LC_ALL=C grep -q /initrd/loopfs /proc/mounts 2>/dev/null ; then
- if [ -e /initrd/dev/.devfsd ]; then
- umount /initrd/dev
- fi
- umount /initrd
- /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
+ if [ -e /initrd/dev/.devfsd ]; then
+ umount /initrd/dev
+ fi
+ umount /initrd
+ /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
fi
-
- # Check for arguments
+
+ # Check for arguments
if grep -iq nopnp /proc/cmdline 2>/dev/null; then
PNP=
else
@@ -345,16 +345,16 @@
# set up pnp and kernel pnp
if [ -n "$PNP" ]; then
- if is_yes "$RUN_USERPNP" && [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ]; then
- run_cmd "Setting up ISA PNP devices (userspace pnp)" /sbin/isapnp /etc/isapnp/isapnp.conf
- fi
- if is_yes "$RUN_KERNELPNP"; then
- /sbin/modprobe -k isa-pnp 2> /dev/null
- if [ -e /proc/isapnp -a -f /etc/isapnp/isapnp-kernel.conf ]; then
- show "Setting up ISA PNP devices (kernelspace pnp)"; busy
- grep -v "^#" /etc/isapnp/isapnp-kernel.conf 2>/dev/null >/proc/isapnp && (deltext; ok) || (deltext; fail)
+ if is_yes "$RUN_USERPNP" && [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ]; then
+ run_cmd "Setting up ISA PNP devices (userspace pnp)" /sbin/isapnp /etc/isapnp/isapnp.conf
+ fi
+ if is_yes "$RUN_KERNELPNP"; then
+ /sbin/modprobe -k isa-pnp 2> /dev/null
+ if [ -e /proc/isapnp -a -f /etc/isapnp/isapnp-kernel.conf ]; then
+ show "Setting up ISA PNP devices (kernelspace pnp)"; busy
+ grep -v "^#" /etc/isapnp/isapnp-kernel.conf 2>/dev/null >/proc/isapnp && (deltext; ok) || (deltext; fail)
+ fi
fi
- fi
fi
# Remount the root filesystem read-write
@@ -368,11 +368,11 @@
# Clean up SELinux labels
if [ -n "$SELINUX" ]; then
- for file in /etc/mtab /etc/cryptomtab /etc/ld.so.cache ; do
- [ -r $file ] && restorecon $file >/dev/null 2>&1
- done
+ for file in /etc/mtab /etc/cryptomtab /etc/ld.so.cache ; do
+ [ -r $file ] && restorecon $file >/dev/null 2>&1
+ done
fi
-
+
# Clear mtab
:>/etc/mtab
[ -f /etc/cryptomtab ] && :>/etc/cryptomtab
@@ -396,7 +396,7 @@
fi
if grep -q cpuset /proc/filesystems 2>/dev/null ; then
- mount -n -t cpuset none /dev/cpuset
+ mount -n -t cpuset none /dev/cpuset
fi
fi
@@ -472,14 +472,14 @@
if ! grep -iq "nofirewire" /proc/cmdline 2>/dev/null ; then
aliases=$(/sbin/modprobe -c | awk '/^alias ieee1394-controller/ { print $3 }')
if [ -n "$aliases" -a "$aliases" != "off" ] ; then
- for alias in $aliases ; do
- [ "$alias" = "off" ] && continue
- run_cmd "$(nls 'Initializing firewire controller') ($alias)" /sbin/modprobe $alias
- done
- LC_ALL=C grep -E "SBP2" /proc/bus/ieee1394/devices 2>/dev/null && /sbin/modprobe -s sbp2 > /dev/null 2>&1
+ for alias in $aliases ; do
+ [ "$alias" = "off" ] && continue
+ run_cmd "$(nls 'Initializing firewire controller') ($alias)" /sbin/modprobe $alias
+ done
+ LC_ALL=C grep -E "SBP2" /proc/bus/ieee1394/devices 2>/dev/null && /sbin/modprobe -s sbp2 > /dev/null 2>&1
fi
- fi
-
+ fi
+
# Load sound modules if they need persistent DMA buffers
if grep -q "^options sound dmabuf=1" "$MODULES_CONF" 2>/dev/null ; then
RETURN=0
@@ -503,18 +503,17 @@
# Find and activate volume groups:
# EVMS
if [ -x /sbin/evms_activate ]; then
-
if [ "$(kernelverser)" -lt "002006" ]; then
- # Linux 2.4 core modules
- modprobe -s -k evms > /dev/null 2>&1
- modprobe -s -k evms_passthru > /dev/null 2>&1
- modprobe -s -k ldev_mgr > /dev/null 2>&1
- modprobe -s -k dos_part > /dev/null 2>&1
+ # Linux 2.4 core modules
+ modprobe -s -k evms > /dev/null 2>&1
+ modprobe -s -k evms_passthru > /dev/null 2>&1
+ modprobe -s -k ldev_mgr > /dev/null 2>&1
+ modprobe -s -k dos_part > /dev/null 2>&1
else
- # Linux 2.6 core module
- modprobe -s -k evmscore > /dev/null 2>&1
+ # Linux 2.6 core module
+ modprobe -s -k evmscore > /dev/null 2>&1
fi
-
+
is_yes "$EVMS_GUID_PTABLE" && modprobe -s -k gpt_part >/dev/null 2>&1
is_yes "$EVMS_LVM" && modprobe -s -k lvm_vge >/dev/null 2>&1
is_yes "$EVMS_AIX" && modprobe -s -k AIXlvm_vge >/dev/null 2>&1
@@ -537,13 +536,12 @@
modprobe -s -k dm-mod >/dev/null 2>&1
lvmignorelock="--ignorelockingfailure"
else
- modprobe -s -k lvm-mod >/dev/null 2>&1
- # device mapper (2.5+ and patched 2.4)
- modprobe -s -k dm-mod >/dev/null 2>&1
- lvmignorelock=""
+ modprobe -s -k lvm-mod >/dev/null 2>&1
+ # device mapper (2.5+ and patched 2.4)
+ modprobe -s -k dm-mod >/dev/null 2>&1
+ lvmignorelock=""
fi
-
-
+
run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelock && \
run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmignorelock
[ "$lvmversion" = "2" ] && /sbin/vgscan --mknodes $lvmignorelock > /dev/null 2>&1
@@ -552,91 +550,88 @@
# Add raid devices
if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ] || [ -f /etc/raidtab ]; then
-
modprobe -s md >/dev/null 2>&1
if [ -f /proc/mdstat ]; then
- goraidtab=1
- golvm=0
- rc=0
-
- if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ]; then
- if (grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf 2>/dev/null); then
- run_cmd "Starting up RAID devices" /sbin/mdadm --assemble --scan
- rc=$?
- [ "$rc" -eq 0 ] && goraidtab=0 && golvm=1
- fi
- fi
-
- if [ -f /etc/raidtab -a "$goraidtab" -eq 1 ]; then
-
- for i in $(grep -v "^#" /etc/raidtab 2>/dev/null | grep "raiddev" 2>/dev/null | awk '{print $2}') ; do
- golvm=1
- RAIDDEV=$(basename $i)
- RAIDSTAT=$(grep "^$RAIDDEV : active" /proc/mdstat 2>/dev/null)
- show "Starting up RAID device %s" $RAIDDEV
- busy
- if [ -z "$RAIDSTAT" ]; then
- # Try raidstart first...if that fails then
- # fall back to raid0run and if that fails too
- # fall back to raidadd, raidrun.
- RESULT=1
- if [ -x /sbin/raidstart ]; then
- /sbin/raidstart $i
- RESULT=$?
- fi
- if [ $RESULT -gt 0 -a -x /sbin/raid0run ]; then
- /sbin/raid0run $i
- RESULT=$?
+ goraidtab=1
+ golvm=0
+ rc=0
+ if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ]; then
+ if (grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf 2>/dev/null); then
+ run_cmd "Starting up RAID devices" /sbin/mdadm --assemble --scan
+ rc=$?
+ [ "$rc" -eq 0 ] && goraidtab=0 && golvm=1
fi
- if [ $RESULT -gt 0 -a -x /sbin/raidadd -a -x /sbin/raidrun ]; then
- /sbin/raidadd $i
- /sbin/raidrun $i
- RESULT=$?
- fi
- if [ $RESULT -gt 0 ]; then
- rc=1
- fail
+ fi
+
+ if [ -f /etc/raidtab -a "$goraidtab" -eq 1 ]; then
+ for i in $(grep -v "^#" /etc/raidtab 2>/dev/null | grep "raiddev" 2>/dev/null | awk '{print $2}') ; do
+ golvm=1
+ RAIDDEV=$(basename $i)
+ RAIDSTAT=$(grep "^$RAIDDEV : active" /proc/mdstat 2>/dev/null)
+ show "Starting up RAID device %s" $RAIDDEV
+ busy
+ if [ -z "$RAIDSTAT" ]; then
+ # Try raidstart first...if that fails then
+ # fall back to raid0run and if that fails too
+ # fall back to raidadd, raidrun.
+ RESULT=1
+ if [ -x /sbin/raidstart ]; then
+ /sbin/raidstart $i
+ RESULT=$?
+ fi
+ if [ $RESULT -gt 0 -a -x /sbin/raid0run ]; then
+ /sbin/raid0run $i
+ RESULT=$?
+ fi
+ if [ $RESULT -gt 0 -a -x /sbin/raidadd -a -x /sbin/raidrun ]; then
+ /sbin/raidadd $i
+ /sbin/raidrun $i
+ RESULT=$?
+ fi
+ if [ $RESULT -gt 0 ]; then
+ rc=1
+ fail
+ else
+ ok
+ fi
+ else
+ ok
+ fi
+ done
+ fi
+
+ # A non-zero return means there were problems
+ if [ $rc -gt 0 ]; then
+ [ -e /proc/splash ] && echo "verbose" > /proc/splash
+ show "Starting up RAID devices"; fail
+ echo
+ echo
+ nls "*** An error occurred during the RAID startup."
+ nls "*** Dropping you to a shell; the system will reboot"
+ nls "*** when you leave the shell."
+ echo
+
+ PS1="$(nls '(RAID Repair)# ')"; export PS1
+ [ "$SELINUX" = "1" ] && disable_selinux
+ if is_yes "$RUN_SULOGIN_ON_ERR"; then
+ /sbin/sulogin
else
- ok
+ /bin/sh
fi
- else
- ok
- fi
- done
- fi
-
- # A non-zero return means there were problems
- if [ $rc -gt 0 ]; then
- [ -e /proc/splash ] && echo "verbose" > /proc/splash
- show "Starting up RAID devices"; fail
- echo
- echo
- nls "*** An error occurred during the RAID startup."
- nls "*** Dropping you to a shell; the system will reboot"
- nls "*** when you leave the shell."
- echo
- PS1="$(nls '(RAID Repair)# ')"; export PS1
- [ "$SELINUX" = "1" ] && disable_selinux
- if is_yes "$RUN_SULOGIN_ON_ERR"; then
- /sbin/sulogin
- else
- /bin/sh
+ run_cmd "Unmounting file systems" umount -a
+ run_cmd "Remounting root filesystem in ro mode" mount -n -o remount,ro /
+ run_cmd "Automatic reboot in progress" reboot
fi
-
- run_cmd "Unmounting file systems" umount -a
- run_cmd "Remounting root filesystem in ro mode" mount -n -o remount,ro /
- run_cmd "Automatic reboot in progress" reboot
- fi
- # LVM on RAID (keep in sync with LVM setting few lines above)
- if [ "$golvm" -eq "1" ]; then
- if is_yes "$EVMS_LVM" || [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
- run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelock && \
- run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmignorelock
- [ "$lvmversion" = "2" ] && /sbin/vgscan --mknodes $lvmignorelock > /dev/null 2>&1
+ # LVM on RAID (keep in sync with LVM setting few lines above)
+ if [ "$golvm" -eq "1" ]; then
+ if is_yes "$EVMS_LVM" || [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
+ run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelock && \
+ run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmignorelock
+ [ "$lvmversion" = "2" ] && /sbin/vgscan --mknodes $lvmignorelock > /dev/null 2>&1
+ fi
fi
- fi
- show "Starting up RAID devices"; ok
+ show "Starting up RAID devices"; ok
fi
fi
@@ -729,7 +724,7 @@
elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then
_RUN_QUOTACHECK=1
fi
-
+
show "Remounting encrypted filesystems back in rw mode"; busy
awk '
FILENAME=="/proc/mounts" {
@@ -746,7 +741,7 @@
fi
if [ "$_RUN_QUOTACHECK" = "1" -a -x /sbin/quotacheck ]; then
- run_cmd "Checking filesystem quotas" /sbin/quotacheck -vnugRa
+ run_cmd "Checking filesystem quotas" /sbin/quotacheck -vnugRa
fi
# Turn on quota
@@ -789,19 +784,19 @@
# Clean up /var
# I'd use find, but /usr may not be mounted.
for afile in /var/lock/* /var/run/*; do
- bafile=$(basename $afile)
+ bafile=$(basename $afile)
if [ -d "$afile" ]; then
[ "$bafile" != "news" -a "$bafile" != "sudo" -a "$bafile" != "mon" ] && rm -rf $afile/*
else
- [ "$bafile" != "hwprofile" ] && rm -f $afile 2> /dev/null
+ [ "$bafile" != "hwprofile" ] && rm -f $afile 2> /dev/null
fi
done
# Delete stale files
rm -f /var/lib/rpm/__db* /var/spool/postoffice/.pid.* /tmp/.X*-lock \
/tmp/.lock.* /tmp/.gdm_socket /tmp/.s.PGSQL.*
rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \
- /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-* \
- /tmp/scrollkeeper-* /tmp/ssh-*
+ /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-* \
+ /tmp/scrollkeeper-* /tmp/ssh-*
{
# Clean up utmp/wtmp
@@ -852,8 +847,8 @@
i=5
while [ $i -ge 0 ]; do
if [ -f /var/log/dmesg.$i ]; then
- chmod 0600 /var/log/dmesg.$i
- mv -f /var/log/dmesg.$i /var/log/dmesg.$(($i+1))
+ chmod 0600 /var/log/dmesg.$i
+ mv -f /var/log/dmesg.$i /var/log/dmesg.$(($i+1))
fi
i=$(($i-1))
done
Modified: rc-scripts/trunk/sysconfig/clock
==============================================================================
--- rc-scripts/trunk/sysconfig/clock (original)
+++ rc-scripts/trunk/sysconfig/clock Wed Oct 26 18:33:29 2005
@@ -1,8 +1,8 @@
# $Id$
-# Should the hardware clock be kept in Coordinated Universal Time
+# Should the hardware clock be kept in Coordinated Universal Time
# (instead of local time).
UTC=false
-# true means your machine uses epoch 1980 in its hardware clock
+# true means your machine uses epoch 1980 in its hardware clock
ARC=false
-# true means your machine uses epoch 1900 in its hardware clock
+# true means your machine uses epoch 1900 in its hardware clock
SRM=false
Modified: rc-scripts/trunk/sysconfig/interfaces/tnlcfg-description
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/tnlcfg-description (original)
+++ rc-scripts/trunk/sysconfig/interfaces/tnlcfg-description Wed Oct 26 18:33:29 2005
@@ -12,14 +12,14 @@
REMOTEADDR=<IPv4 addres>
[ LOCALADDR=<IPv4 addres> ]
- [ BIND_DEV= ] do jakiego device przybindować (ma związek z routingiem itp)
+ [ BIND_DEV= ] do jakiego device przybindować (ma związek z routingiem itp)
[ TTL= ]
[ TOS= ]
[ PMTUDISC={no|yes} ]
if MODE=gre ; then
-
+
[ KEY= ]
[ IKEY= ]
[ OKEY= ]
@@ -29,18 +29,14 @@
[ CSUM={no|yes} ]
[ ICSUM={no|yes} ]
[ OCSUM={no|yes} ]
-
fi
-
else MODE=four ; then
- REMOTEADDR=<IPv6 addres>
+ REMOTEADDR=<IPv6 addres>
LOCALADDR=<IPv6 addres>
-
+
[ PRIORITY= ]
[ HOPLIMIT= ]
[ ENCAPLIMIT= ]
-
fi
-
Modified: rc-scripts/trunk/sysconfig/interfaces/tnlcfg-icm
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/tnlcfg-icm (original)
+++ rc-scripts/trunk/sysconfig/interfaces/tnlcfg-icm Wed Oct 26 18:33:29 2005
@@ -5,7 +5,7 @@
IPADDR1="3ffe:8010:70::2/126"
IP6_PRIM_IF=1
BIND_DEV=eth0
-TTL=64
+TTL=64
ONBOOT=yes
#TOS=
#SEQ={no|yes} ]
Modified: rc-scripts/trunk/sysconfig/network
==============================================================================
--- rc-scripts/trunk/sysconfig/network (original)
+++ rc-scripts/trunk/sysconfig/network Wed Oct 26 18:33:29 2005
@@ -56,4 +56,4 @@
TLEDS_DEV=no
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network Wed Oct 26 18:33:29 2005
@@ -1,266 +1,267 @@
#!/bin/sh - keep it for file(1) to get bourne shell script result
#
# $Id$
-#
+#
# This is not a shell script; it provides functions to network scripts
# that source it.
source_config ()
{
-DEVNAME=$(basename "$CONFIG" | awk ' { gsub(/^ifcfg-/,NIL); print $0; } ')
-
-if echo "$CONFIG"|egrep "^/" >/dev/null 2>&1 ; then
- if [ -f "$CONFIG" ] ; then
- . "$CONFIG"
- fi
-elif [ -f "/etc/sysconfig/interfaces/$CONFIG" ] ; then
- . "/etc/sysconfig/interfaces/$CONFIG"
-fi
-if [ -n "${PREFIX}" ] && ! $(echo $IPADDR | grep "/" 2>&1 >/dev/null) ; then
- IPADDR="$IPADDR/$PREFIX"
-fi
+ DEVNAME=$(basename "$CONFIG" | awk ' { gsub(/^ifcfg-/,NIL); print $0; } ')
+
+ if echo "$CONFIG"|egrep "^/" >/dev/null 2>&1 ; then
+ if [ -f "$CONFIG" ] ; then
+ . "$CONFIG"
+ fi
+ elif [ -f "/etc/sysconfig/interfaces/$CONFIG" ] ; then
+ . "/etc/sysconfig/interfaces/$CONFIG"
+ fi
+ if [ -n "${PREFIX}" ] && ! $(echo $IPADDR | grep "/" 2>&1 >/dev/null) ; then
+ IPADDR="$IPADDR/$PREFIX"
+ fi
}
do_netreport ()
{
-# Notify programs that have requested notification
-( cd /var/run/netreport || exit
-for i in * ; do
- [ -f $i ] && \
- kill -SIGIO $i >/dev/null 2>&1 || \
- rm -f $i >/dev/null 2>&1
-done
-)
+ # Notify programs that have requested notification
+ ( cd /var/run/netreport || exit
+ for i in * ; do
+ [ -f $i ] && kill -SIGIO $i >/dev/null 2>&1 || \
+ rm -f $i >/dev/null 2>&1
+ done
+ )
}
need_hostname()
{
-if [ "`hostname`" = "(none)" -o "`hostname`" = "localhost" -o \
- "`hostname`" = "localhost.localdomain" ]; then
- NEEDHOSTNAME=yes
-else
- unset NEEDHOSTNAME
-fi
+ if [ "`hostname`" = "(none)" -o "`hostname`" = "localhost" -o \
+ "`hostname`" = "localhost.localdomain" ]; then
+ NEEDHOSTNAME=yes
+ else
+ unset NEEDHOSTNAME
+ fi
}
set_hostname()
{
-typeset hostname domain
-hostname=$(echo $1 | awk ' { gsub(/\..*$/,NIL); print $0; } ')
-domain=$(echo $1 | awk ' { sub(/^[^\.]*\./,NIL); print $0; } ')
-
-if [ -n "$hostname" ] ; then
- echo "$hostname" > /etc/HOSTNAME
- hostname $hostname
-fi
-
-if [ -n "$domain" ] ; then
- >/etc/resolv.conf.new
- if ! grep -q "search $domain" /etc/resolv.conf ; then
- echo "search $domain" >> /etc/resolv.conf.new
- fi
- echo "domain $domain" >> /etc/resolv.conf.new
- grep -v "^domain " /etc/resolv.conf >> /etc/resolv.conf.new
- mv -f /etc/resolv.conf.new /etc/resolv.conf
-fi
+ typeset hostname domain
+
+ hostname=$(echo $1 | awk ' { gsub(/\..*$/,NIL); print $0; } ')
+ domain=$(echo $1 | awk ' { sub(/^[^\.]*\./,NIL); print $0; } ')
+
+ if [ -n "$hostname" ] ; then
+ echo "$hostname" > /etc/HOSTNAME
+ hostname $hostname
+ fi
+
+ if [ -n "$domain" ] ; then
+ >/etc/resolv.conf.new
+ if ! grep -q "search $domain" /etc/resolv.conf ; then
+ echo "search $domain" >> /etc/resolv.conf.new
+ fi
+ echo "domain $domain" >> /etc/resolv.conf.new
+ grep -v "^domain " /etc/resolv.conf >> /etc/resolv.conf.new
+ mv -f /etc/resolv.conf.new /etc/resolv.conf
+ fi
}
# Setup Network Address Translation (NAT)
setup_nat()
{
-typeset src via dst
-if [ -r /etc/sysconfig/static-nat ]; then
- if [ "$1" = "on" ]; then
- grep "^[0-9]" /etc/sysconfig/static-nat | while read src via dst; do
- /sbin/ip route add nat $dst via $src
- /sbin/ip rule add from $src nat $dst
- done
- elif [ "$1" = "off" ]; then
- /sbin/ip route show table all | egrep "^nat[[:blank:]]" | while read nat dst via src args; do
- /sbin/ip rule del from $src nat $dst
- /sbin/ip route del nat $dst via $src
- done
- fi
-fi
+ typeset src via dst
+
+ if [ -r /etc/sysconfig/static-nat ]; then
+ if [ "$1" = "on" ]; then
+ grep "^[0-9]" /etc/sysconfig/static-nat | while read src via dst; do
+ /sbin/ip route add nat $dst via $src
+ /sbin/ip rule add from $src nat $dst
+ done
+ elif [ "$1" = "off" ]; then
+ /sbin/ip route show table all | egrep "^nat[[:blank:]]" | while read nat dst via src args; do
+ /sbin/ip rule del from $src nat $dst
+ /sbin/ip route del nat $dst via $src
+ done
+ fi
+ fi
}
# Setup static ARP
static_arp()
{
-typeset rc arpdev host hwaddr flags neflags
-if is_yes "$STATIC_ARP" && [ -r /etc/ethers ]; then
- if [ -x /sbin/arp ]; then
- run_cmd "Setting static ARP entries" /sbin/arp -f /etc/ethers
- else
- show "Setting static ARP entries"; busy
- rc=0
- arpdev=$(ip link show | awk -F':' '(/UP/) && ! (/NOARP/) && ! (/lo:/) && ! (/NONE:/) { print $2; exit }')
- if [ -z "$arpdev" ]; then
- rc=1
- else
- # ip supports only ip addresses
- grep "^[0-9]" /etc/ethers | \
- while read host hwaddr flags; do
- case "$flags" in
- *temp*)
- neflags="nud stale"
- ;;
- *)
- neflags="nud permanent"
- ;;
- esac
- if ! /sbin/ip neigh add $host lladdr $hwaddr $neflags dev $arpdev; then
- rc=1
+ typeset rc arpdev host hwaddr flags neflags
+
+ if is_yes "$STATIC_ARP" && [ -r /etc/ethers ]; then
+ if [ -x /sbin/arp ]; then
+ run_cmd "Setting static ARP entries" /sbin/arp -f /etc/ethers
+ else
+ show "Setting static ARP entries"; busy
+ rc=0
+ arpdev=$(ip link show | awk -F':' '(/UP/) && ! (/NOARP/) && ! (/lo:/) && ! (/NONE:/) { print $2; exit }')
+ if [ -z "$arpdev" ]; then
+ rc=1
+ else
+ # ip supports only ip addresses
+ grep "^[0-9]" /etc/ethers | \
+ while read host hwaddr flags; do
+ case "$flags" in
+ *temp*)
+ neflags="nud stale"
+ ;;
+ *)
+ neflags="nud permanent"
+ ;;
+ esac
+ if ! /sbin/ip neigh add $host lladdr $hwaddr $neflags dev $arpdev; then
+ rc=1
+ fi
+ done
+ fi
+ if [ "$rc" -gt 0 ]; then
+ fail
+ fi
fi
- done
- fi
- if [ "$rc" -gt 0 ]; then
- fail
fi
- fi
-fi
}
static_rarp()
{
-if is_yes "$STATIC_RARP"; then
- if [ ! -e /proc/net/rarp ]; then
- _modprobe single -k rarp
- fi
- if [ -r /etc/ethers -a -x /sbin/rarp ]; then
- run_cmd "Setting static RARP entries" /sbin/rarp -f /etc/ethers
- fi
-fi
+ if is_yes "$STATIC_RARP"; then
+ if [ ! -e /proc/net/rarp ]; then
+ _modprobe single -k rarp
+ fi
+ if [ -r /etc/ethers -a -x /sbin/rarp ]; then
+ run_cmd "Setting static RARP entries" /sbin/rarp -f /etc/ethers
+ fi
+ fi
}
vlan_setup()
{
-if [ -x /sbin/vconfig -a -e /proc/net/vlan/config ] && `echo $DEVICE | grep -q ^eth`; then
- /sbin/vconfig set_name_type DEV_PLUS_VID_NO_PAD 2>&1 > /dev/null
- ETH_VLANS="yes"
-else
- ETH_VLANS="no"
-fi
+ if [ -x /sbin/vconfig -a -e /proc/net/vlan/config ] && `echo $DEVICE | grep -q ^eth`; then
+ /sbin/vconfig set_name_type DEV_PLUS_VID_NO_PAD 2>&1 > /dev/null
+ ETH_VLANS="yes"
+ else
+ ETH_VLANS="no"
+ fi
}
# Set up all IP && IP parameter variables
setup_ip_param ()
{
-# detect network device type (ie. dummy, eth for dummy0, eth0 ..)
-if [ -z "$DEVICETYPE" ]; then
- DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?[0-9]*$/,NUL); print $0 } ')
-fi
-
-# Setup DEVICETYPE for special cases.
-if (echo ${DEVICE} | LC_ALL=C egrep -q '^[a-z0-9]+\.[0-9]+$'); then
- DEVICETYPE=vlan
-fi
-
-# real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
-DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
-
-eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
-if echo "${IP4ADDR}" | grep -q ":" ; then
- IP6ADDR=${IP4ADDR}
- IP4ADDR=""
-else
- eval IP4ADDROPT="\$IP_AOPTS${IP4_PRIM_IF:-}"
- eval IP4ROUTEOPT="\$IP_ROPTS${IP4_PRIM_IF:-}"
-fi
-if [ -n "${IP6_PRIM_IF}" ] ; then
- eval IP6ADDR="\$IPADDR${IP6_PRIM_IF:-}"
- eval IP6ADDROPT="\$IPV6_AOPTS${IP6_PRIM_IF:-}"
-fi
-if [ -n "${IP4_SRC_IF}" ] ; then
- eval IP4SRCADDR="\$IPADDR${IP4_SRC_IF}"
- IP4SRCADDR=$(echo ${IP4SRCADDR} | awk ' { gsub(/\/.*/,NIL); print "src " $0; } ')
-fi
-if [ -n "${IP6_SRC_IF}" ] ; then
- eval IP6SRCADDR="\$IPADDR${IP6_SRC_IF}"
- IP6SRCADDR=$(echo ${IP6SRCADDR} | awk ' { gsub(/\/.*/,NIL); print "src " $0; } ')
-fi
-
-# new rc-scripts 0.4.x option
-if [ -z "$HANDLING" ]; then
- HANDLING=0
-fi
-
-# set handling for bridge
-case "$DEVICETYPE" in
- br|atm|lec|irda|vlan)
- HANDLING=1
- ;;
-esac
-
-# Multicast ready devices
-if is_yes "$MULTICAST"; then
- MULTICAST="on"
-else
- case "$DEVICETYPE" in
- eth|br)
- MULTICAST="on"
- ;;
- *)
- MULTICAST="off"
- ;;
- esac
-fi
-
-# ARP ready devices
-if [ -n "$ARP" ] ; then
- if is_yes "$ARP"; then
- ARP="arp on"
- else
- ARP="arp off"
- fi
-fi
+ # detect network device type (ie. dummy, eth for dummy0, eth0 ..)
+ if [ -z "$DEVICETYPE" ]; then
+ DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?[0-9]*$/,NUL); print $0 } ')
+ fi
+
+ # Setup DEVICETYPE for special cases.
+ if (echo ${DEVICE} | LC_ALL=C egrep -q '^[a-z0-9]+\.[0-9]+$'); then
+ DEVICETYPE=vlan
+ fi
+
+ # real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
+ DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
+
+ eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
+ if echo "${IP4ADDR}" | grep -q ":" ; then
+ IP6ADDR=${IP4ADDR}
+ IP4ADDR=""
+ else
+ eval IP4ADDROPT="\$IP_AOPTS${IP4_PRIM_IF:-}"
+ eval IP4ROUTEOPT="\$IP_ROPTS${IP4_PRIM_IF:-}"
+ fi
+ if [ -n "${IP6_PRIM_IF}" ] ; then
+ eval IP6ADDR="\$IPADDR${IP6_PRIM_IF:-}"
+ eval IP6ADDROPT="\$IPV6_AOPTS${IP6_PRIM_IF:-}"
+ fi
+ if [ -n "${IP4_SRC_IF}" ] ; then
+ eval IP4SRCADDR="\$IPADDR${IP4_SRC_IF}"
+ IP4SRCADDR=$(echo ${IP4SRCADDR} | awk ' { gsub(/\/.*/,NIL); print "src " $0; } ')
+ fi
+ if [ -n "${IP6_SRC_IF}" ] ; then
+ eval IP6SRCADDR="\$IPADDR${IP6_SRC_IF}"
+ IP6SRCADDR=$(echo ${IP6SRCADDR} | awk ' { gsub(/\/.*/,NIL); print "src " $0; } ')
+ fi
+ # new rc-scripts 0.4.x option
+ if [ -z "$HANDLING" ]; then
+ HANDLING=0
+ fi
+
+ # set handling for bridge
+ case "$DEVICETYPE" in
+ br|atm|lec|irda|vlan)
+ HANDLING=1
+ ;;
+ esac
+
+ # Multicast ready devices
+ if is_yes "$MULTICAST"; then
+ MULTICAST="on"
+ else
+ case "$DEVICETYPE" in
+ eth|br)
+ MULTICAST="on"
+ ;;
+ *)
+ MULTICAST="off"
+ ;;
+ esac
+ fi
+
+ # ARP ready devices
+ if [ -n "$ARP" ] ; then
+ if is_yes "$ARP"; then
+ ARP="arp on"
+ else
+ ARP="arp off"
+ fi
+ fi
}
check_device_down ()
{
- if (ip link show dev ${DEVICE} 2> /dev/null | grep -q UP); then
- return 1
- else
- return 0
- fi
-}
-
-setup_ip_gw_ro ()
-{
-# IPv4 gateway
-if is_yes "$IPV4_NETWORKING"; then
- if [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then
- # set up default gateway
- if [ -n "${GATEWAY}" ]; then
- ip -4 route add default via ${GATEWAY} dev ${DEVICE} ${IP4SRCADDR} onlink
- DEFGW=${GATEWAY}
- elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then
- ip -4 route add default dev ${DEVICE} ${IP4SRCADDR}
- fi
- fi
-fi
-
-# IPv6 gateway && IPv6 globalroute
-if is_yes "$IPV6_NETWORKING"; then
- if [ -z "${GATEWAY6DEV}" -o "${GATEWAY6DEV}" = "${DEVICE}" ]; then
- # set up default gateway
- if [ -n "${GATEWAY6}" ]; then
- ip -6 route add default via ${GATEWAY6} dev ${DEVICE} ${IP6SRCADDR} onlink
- DEFGW6=${GATEWAY6}
- elif [ "${GATEWAY6DEV}" = "${DEVICE}" ]; then
- ip -6 route add default dev ${DEVICE} ${IP6SRCADDR}
- fi
- fi
- if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
- # set up default route
- if [ -n "${IPV6_GLOBALROUTEGW}" ]; then
- ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
- elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
- ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR}
+ if (ip link show dev ${DEVICE} 2> /dev/null | grep -q UP); then
+ return 1
+ else
+ return 0
+ fi
+}
+
+setup_ip_gw_ro ()
+{
+ # IPv4 gateway
+ if is_yes "$IPV4_NETWORKING"; then
+ if [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then
+ # set up default gateway
+ if [ -n "${GATEWAY}" ]; then
+ ip -4 route add default via ${GATEWAY} dev ${DEVICE} ${IP4SRCADDR} onlink
+ DEFGW=${GATEWAY}
+ elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then
+ ip -4 route add default dev ${DEVICE} ${IP4SRCADDR}
+ fi
+ fi
+ fi
+
+ # IPv6 gateway && IPv6 globalroute
+ if is_yes "$IPV6_NETWORKING"; then
+ if [ -z "${GATEWAY6DEV}" -o "${GATEWAY6DEV}" = "${DEVICE}" ]; then
+ # set up default gateway
+ if [ -n "${GATEWAY6}" ]; then
+ ip -6 route add default via ${GATEWAY6} dev ${DEVICE} ${IP6SRCADDR} onlink
+ DEFGW6=${GATEWAY6}
+ elif [ "${GATEWAY6DEV}" = "${DEVICE}" ]; then
+ ip -6 route add default dev ${DEVICE} ${IP6SRCADDR}
+ fi
+ fi
+ if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
+ # set up default route
+ if [ -n "${IPV6_GLOBALROUTEGW}" ]; then
+ ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
+ elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
+ ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR}
+ fi
+ fi
fi
- fi
-fi
}
#
@@ -270,44 +271,45 @@
#
setup_routes()
{
-typeset args
-if [ -f /etc/sysconfig/static-routes ]; then
- if [ "$1" = "on" -o "$1" = "yes" ] ; then
- egrep "^(none|any)[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
- /sbin/ip route add $args
- done
- else
- egrep "^(none|any)[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
- /sbin/ip route del $args 2>/dev/null
- done
- fi
-fi
+ typeset args
+
+ if [ -f /etc/sysconfig/static-routes ]; then
+ if [ "$1" = "on" -o "$1" = "yes" ] ; then
+ egrep "^(none|any)[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
+ /sbin/ip route add $args
+ done
+ else
+ egrep "^(none|any)[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
+ /sbin/ip route del $args 2>/dev/null
+ done
+ fi
+ fi
}
# Add ONLY IPv4 address (IPv6 address is added automaticly)
set_up_loopback()
{
-if is_yes "$IPV4_NETWORKING"; then
- ip addr add 127.0.0.1/8 dev lo
-fi
-ip link set dev lo up
+ if is_yes "$IPV4_NETWORKING"; then
+ ip addr add 127.0.0.1/8 dev lo
+ fi
+ ip link set dev lo up
}
set_down_loopback()
{
-ip addr flush dev lo 2>&1 | grep -v "Nothing to flush"
-ip link set dev lo down
+ ip addr flush dev lo 2>&1 | grep -v "Nothing to flush"
+ ip link set dev lo down
}
modprobe_net()
{
-if is_yes "$IPV6_NETWORKING" && is_module "ipv6"; then
- _modprobe single -k ipv6
-fi
-
-if is_yes "$IPX" && is_module "ipx"; then
- _modprobe single -k ipx
-fi
+ if is_yes "$IPV6_NETWORKING" && is_module "ipv6"; then
+ _modprobe single -k ipv6
+ fi
+
+ if is_yes "$IPX" && is_module "ipx"; then
+ _modprobe single -k ipx
+ fi
}
#
@@ -316,38 +318,37 @@
#
calcprefix()
{
-typeset OISF len olen bad prefix
-prefix=0
-olen=8
-bad=0
-
-for i in 1 2 3 4; do
- len=0
- j=$(echo "$1" | awk -F"." "{ print \$${i} }")
- case "$j" in
- 255) len=8 ;;
- 254) len=7 ;;
- 252) len=6 ;;
- 248) len=5 ;;
- 240) len=4 ;;
- 224) len=3 ;;
- 192) len=2 ;;
- 128) len=1 ;;
- 0) len=0 ;;
- *) len=300 ;;
- esac
-
- [ "$len" -gt "$olen" ] && bad=1
- prefix=$(($prefix + $len))
- olen=$len
-done
-
-if [ "$bad" = "0" ]; then
- echo "$prefix"
-else
- echo "32"
-fi
-return
+ typeset len olen bad prefix
+
+ prefix=0
+ olen=8
+ bad=0
+ for i in 1 2 3 4; do
+ len=0
+ j=$(echo "$1" | awk -F"." "{ print \$${i} }")
+ case "$j" in
+ 255) len=8 ;;
+ 254) len=7 ;;
+ 252) len=6 ;;
+ 248) len=5 ;;
+ 240) len=4 ;;
+ 224) len=3 ;;
+ 192) len=2 ;;
+ 128) len=1 ;;
+ 0) len=0 ;;
+ *) len=300 ;;
+ esac
+ [ "$len" -gt "$olen" ] && bad=1
+ prefix=$(($prefix + $len))
+ olen=$len
+ done
+
+ if [ "$bad" = "0" ]; then
+ echo "$prefix"
+ else
+ echo "32"
+ fi
+ return
}
#
@@ -356,187 +357,188 @@
#
calcnetmask()
{
-typeset prefix a MASK
-MASK=""
-if [ "`echo "${1}" | grep "^[0-9]"`" = "" ]; then
- prefix=32
-else
- typeset -i prefix=$1
-fi
-for i in 1 2 3 4; do
- case $prefix in
- 7) a=254 ;;
- 6) a=252 ;;
- 5) a=248 ;;
- 4) a=240 ;;
- 3) a=224 ;;
- 2) a=192 ;;
- 1) a=128 ;;
- *)
- [ $prefix -ge 8 ] && a=255
- [ $prefix -le 0 ] && a=0
- ;;
- esac
-
- prefix="$(( $prefix - 8))"
- if [ -z "$MASK" ]; then
- MASK=$a
- else
- MASK=$MASK.$a
- fi
-done
+ typeset prefix a MASK
-echo $MASK
-return
+ MASK=""
+ if [ "`echo "${1}" | grep "^[0-9]"`" = "" ]; then
+ prefix=32
+ else
+ typeset -i prefix=$1
+ fi
+ for i in 1 2 3 4; do
+ case $prefix in
+ 7) a=254 ;;
+ 6) a=252 ;;
+ 5) a=248 ;;
+ 4) a=240 ;;
+ 3) a=224 ;;
+ 2) a=192 ;;
+ 1) a=128 ;;
+ *)
+ [ $prefix -ge 8 ] && a=255
+ [ $prefix -le 0 ] && a=0
+ ;;
+ esac
+
+ prefix="$(( $prefix - 8))"
+ if [ -z "$MASK" ]; then
+ MASK=$a
+ else
+ MASK=$MASK.$a
+ fi
+ done
+
+ echo $MASK
+ return
}
# Retrievies PPPD PID and real interface name from /var/run/ppp-*.pid
-get_ppp_device_and_pid () {
-
-if [ -f "/var/run/ppp-$DEVNAME.pid" ] ; then
- eval `{
- read PID ; echo "PID='$PID'"
- read REALDEVICE ; echo "REALDEVICE=$REALDEVICE"
- } < "/var/run/ppp-$DEVNAME.pid"`
-fi
-
-if [ -z "$REALDEVICE" ] ; then
- REALDEVICE=$DEVICE
-fi
+get_ppp_device_and_pid ()
+{
+ if [ -f "/var/run/ppp-$DEVNAME.pid" ] ; then
+ eval `{
+ read PID ; echo "PID='$PID'"
+ read REALDEVICE ; echo "REALDEVICE=$REALDEVICE"
+ } < "/var/run/ppp-$DEVNAME.pid"`
+ fi
+
+ if [ -z "$REALDEVICE" ] ; then
+ REALDEVICE=$DEVICE
+ fi
}
# following function setups advanced routing rules
# Olgierd Pieczul <wojrus at pld-linux.org>
-setup_ip_rules () {
-typeset args prio from src
-if [ -f /etc/sysconfig/static-routes ] ; then
- if is_yes "$1"; then
- egrep "^(from|to|iif|tos|fwmark|dev|pref|priority|prio)[[:blank:]]" /etc/sysconfig/static-routes | while read args; do
- /sbin/ip rule add $args
- done
- elif is_no "$1"; then
- /sbin/ip rule show | egrep -v -e "from all lookup (main|default|local) \$" -e " map-to " | while read prio from src args; do
- [ "$src" == "all" ] && ip rule delete $args || ip rule delete $from $src $args
- done
- fi
-fi
+setup_ip_rules ()
+{
+ typeset args prio from src
+
+ if [ -f /etc/sysconfig/static-routes ] ; then
+ if is_yes "$1"; then
+ egrep "^(from|to|iif|tos|fwmark|dev|pref|priority|prio)[[:blank:]]" /etc/sysconfig/static-routes | while read args; do
+ /sbin/ip rule add $args
+ done
+ elif is_no "$1"; then
+ /sbin/ip rule show | egrep -v -e "from all lookup (main|default|local) \$" -e " map-to " | while read prio from src args; do
+ [ "$src" == "all" ] && ip rule delete $args || ip rule delete $from $src $args
+ done
+ fi
+ fi
}
-#
+is_wireless_device ()
+{
+ if [ -x /sbin/iwconfig ]; then
+ LC_ALL=C iwconfig "${1}" 2>&1 | grep -q "no wireless extensions" || return 0
+ fi
+ return 1
+}
-is_wireless_device () {
- if [ -x /sbin/iwconfig ]; then
- LC_ALL=C iwconfig "${1}" 2>&1 | grep -q "no wireless extensions" || return 0
- fi
- return 1
-}
-
-wireless_param () {
-
- device="$1"
- if [ "$2" = "br" ]; then
- prefix="${device}_"
- else
- prefix=""
- fi
-
- if [ -z "$(eval echo \$${prefix}WLAN_NICKNAME)" ]; then
- WLAN_NICKNAME="$(hostname -f)"
- else
- WLAN_NICKANME="$(eval echo \$${prefix}WLAN_NICKNAME)"
- fi
-
- # wlan mode needs to be first
- [ -n "$(eval echo \$${prefix}WLAN_MODE)" ] && \
- iwconfig ${device} mode "$(eval echo \$${prefix}WLAN_MODE)"
- iwconfig ${device} nickname ${WLAN_NICKNAME}
- [ -n "$(eval echo \$${prefix}WLAN_ESSID)" ] && \
- iwconfig ${device} essid "$(eval echo \$${prefix}WLAN_ESSID)"
- [ -n "$(eval echo \$${prefix}WLAN_NWID)" ] && \
- iwconfig ${device} nwid "$(eval echo \$${prefix}WLAN_NWID)"
- if [ -n "$(eval echo \$${prefix}WLAN_FREQ)" -a "$(eval echo \$${prefix}${WLAN_MODE})" != "Managed" ] ; then
- iwconfig ${device} freq "$(eval echo \$${prefix}WLAN_FREQ)"
- elif [ -n "$(eval echo \$${prefix}WLAN_CHANNEL)" -a "$(eval echo \$${prefix}${WLAN_MODE})" != "Managed" ]; then
- iwconfig ${device} channel "$(eval echo \$${prefix}WLAN_CHANNEL)"
- fi
- [ -n "$(eval echo \$${prefix}WLAN_SENS)" ] && \
- iwconfig ${device} sens "$(eval echo \$${prefix}WLAN_SENS)"
- [ -n "$(eval echo \$${prefix}WLAN_AP)" ] && \
- iwconfig ${device} ap "$(eval echo \$${prefix}WLAN_AP)"
- [ -n "$(eval echo \$${prefix}WLAN_BITRATE)" ] && \
- iwconfig ${device} rate "$(eval echo \$${prefix}WLAN_BITRATE)"
- [ -n "$(eval echo \$${prefix}WLAN_RTS_THRESHOLD)" ] && \
- iwconfig ${device} rts "$(eval echo \$${prefix}WLAN_RTS_THRESHOLD)"
- [ -n "$(eval echo \$${prefix}WLAN_FRAGMENTATION_THRESHOLD)" ] && \
- iwconfig ${device} frag "$(eval echo \$${prefix}WLAN_FRAGMENTATION_THRESHOLD)"
- if [ -n "$(eval echo \$${prefix}WLAN_KEY)" ]; then
- iwconfig ${device} key "$(eval echo \$${prefix}WLAN_KEY)"
- [ -n "$(eval echo \$${prefix}WLAN_ENCRYPTION)" ] && \
- iwconfig ${device} key "$(eval echo \$${prefix}WLAN_ENCRYPTION)"
- fi
- if is_no "$(eval echo \$${prefix}WLAN_ENCRYPTION)"; then
- iwconfig ${device} key off
- fi
- [ -n "$(eval echo \$${prefix}WLAN_POWER)" ] && \
- iwconfig ${device} "$(eval echo \$${prefix}WLAN_POWER)"
- [ -n "$(eval echo \$${prefix}WLAN_TXPOWER)" ] && \
- iwconfig ${device} "$(eval echo \$${prefix}WLAN_TXPOWER)"
- [ -n "$(eval echo \$${prefix}WLAN_RETRY)" ] && \
- iwconfig ${device} "$(eval echo \$${prefix}WLAN_RETRY)"
- if is_yes "$(eval echo \$${prefix}WLAN_COMMIT)"; then
- iwconfig ${device} commit
- fi
- [ -n "$(eval echo \$${prefix}WLAN_NWID)" ] && iwconfig ${device} \
- nwid "$(eval echo \$${prefix}WLAN_NWID)"
-
- #essid should be last due to netowork rescanning by wlan devices
- [ -n "$(eval echo \$${prefix}WLAN_ESSID)" ] && iwconfig ${device} \
- essid "$(eval echo \$${prefix}WLAN_ESSID)"
+wireless_param ()
+{
+ device="$1"
+ if [ "$2" = "br" ]; then
+ prefix="${device}_"
+ else
+ prefix=""
+ fi
+ if [ -z "$(eval echo \$${prefix}WLAN_NICKNAME)" ]; then
+ WLAN_NICKNAME="$(hostname -f)"
+ else
+ WLAN_NICKANME="$(eval echo \$${prefix}WLAN_NICKNAME)"
+ fi
+
+ # wlan mode needs to be first
+ [ -n "$(eval echo \$${prefix}WLAN_MODE)" ] && \
+ iwconfig ${device} mode "$(eval echo \$${prefix}WLAN_MODE)"
+ iwconfig ${device} nickname ${WLAN_NICKNAME}
+ [ -n "$(eval echo \$${prefix}WLAN_ESSID)" ] && \
+ iwconfig ${device} essid "$(eval echo \$${prefix}WLAN_ESSID)"
+ [ -n "$(eval echo \$${prefix}WLAN_NWID)" ] && \
+ iwconfig ${device} nwid "$(eval echo \$${prefix}WLAN_NWID)"
+ if [ -n "$(eval echo \$${prefix}WLAN_FREQ)" -a "$(eval echo \$${prefix}${WLAN_MODE})" != "Managed" ] ; then
+ iwconfig ${device} freq "$(eval echo \$${prefix}WLAN_FREQ)"
+ elif [ -n "$(eval echo \$${prefix}WLAN_CHANNEL)" -a "$(eval echo \$${prefix}${WLAN_MODE})" != "Managed" ]; then
+ iwconfig ${device} channel "$(eval echo \$${prefix}WLAN_CHANNEL)"
+ fi
+ [ -n "$(eval echo \$${prefix}WLAN_SENS)" ] && \
+ iwconfig ${device} sens "$(eval echo \$${prefix}WLAN_SENS)"
+ [ -n "$(eval echo \$${prefix}WLAN_AP)" ] && \
+ iwconfig ${device} ap "$(eval echo \$${prefix}WLAN_AP)"
+ [ -n "$(eval echo \$${prefix}WLAN_BITRATE)" ] && \
+ iwconfig ${device} rate "$(eval echo \$${prefix}WLAN_BITRATE)"
+ [ -n "$(eval echo \$${prefix}WLAN_RTS_THRESHOLD)" ] && \
+ iwconfig ${device} rts "$(eval echo \$${prefix}WLAN_RTS_THRESHOLD)"
+ [ -n "$(eval echo \$${prefix}WLAN_FRAGMENTATION_THRESHOLD)" ] && \
+ iwconfig ${device} frag "$(eval echo \$${prefix}WLAN_FRAGMENTATION_THRESHOLD)"
+ if [ -n "$(eval echo \$${prefix}WLAN_KEY)" ]; then
+ iwconfig ${device} key "$(eval echo \$${prefix}WLAN_KEY)"
+ [ -n "$(eval echo \$${prefix}WLAN_ENCRYPTION)" ] && \
+ iwconfig ${device} key "$(eval echo \$${prefix}WLAN_ENCRYPTION)"
+ fi
+ if is_no "$(eval echo \$${prefix}WLAN_ENCRYPTION)"; then
+ iwconfig ${device} key off
+ fi
+ [ -n "$(eval echo \$${prefix}WLAN_POWER)" ] && \
+ iwconfig ${device} "$(eval echo \$${prefix}WLAN_POWER)"
+ [ -n "$(eval echo \$${prefix}WLAN_TXPOWER)" ] && \
+ iwconfig ${device} "$(eval echo \$${prefix}WLAN_TXPOWER)"
+ [ -n "$(eval echo \$${prefix}WLAN_RETRY)" ] && \
+ iwconfig ${device} "$(eval echo \$${prefix}WLAN_RETRY)"
+ if is_yes "$(eval echo \$${prefix}WLAN_COMMIT)"; then
+ iwconfig ${device} commit
+ fi
+ [ -n "$(eval echo \$${prefix}WLAN_NWID)" ] && iwconfig ${device} \
+ nwid "$(eval echo \$${prefix}WLAN_NWID)"
+
+ #essid should be last due to netowork rescanning by wlan devices
+ [ -n "$(eval echo \$${prefix}WLAN_ESSID)" ] && iwconfig ${device} \
+ essid "$(eval echo \$${prefix}WLAN_ESSID)"
}
check_mii_tool ()
{
- [ -x /sbin/mii-tool ] || return 2
- output=$(LC_ALL=C mii-tool $1 2>&1)
- echo $output | LC_ALL=C grep -q "link ok" && return 1
- echo $output | LC_ALL=C grep -q "no link" && return 0 || return 2
+ [ -x /sbin/mii-tool ] || return 2
+ output=$(LC_ALL=C mii-tool $1 2>&1)
+ echo $output | LC_ALL=C grep -q "link ok" && return 1
+ echo $output | LC_ALL=C grep -q "no link" && return 0 || return 2
}
check_ethtool ()
{
- [ -x /sbin/ethtool ] || return 2
- output=$(LC_ALL=C ethtool $1 2>&1)
- echo $output | LC_ALL=C grep -q "Link detected: yes" && return 1
- echo $output | LC_ALL=C grep -q "Link detected: no" && return 0 || return 2
+ [ -x /sbin/ethtool ] || return 2
+ output=$(LC_ALL=C ethtool $1 2>&1)
+ echo $output | LC_ALL=C grep -q "Link detected: yes" && return 1
+ echo $output | LC_ALL=C grep -q "Link detected: no" && return 0 || return 2
}
check_link_down ()
{
- if [ -x /sbin/mii-tool -o -x /sbin/ethtool ]; then
- if ! LC_ALL=C ip link show dev $1 2>/dev/null| grep -q UP ; then
- ip link set dev $1 up >/dev/null 2>&1
- timeout=0
- while [ $timeout -le 10 ]; do
- check_mii_tool $1
- m=$?
- check_ethtool $1
- e=$?
- if [ $m -eq 1 ] || [ $e -eq 1 ] ; then
- return 1
- fi
- if [ $m -eq 2 ] && [ $e -eq 2 ] ; then
- return 1
- fi
- usleep 500000
- timeout=$((timeout+1))
- done
- return 0
+ if [ -x /sbin/mii-tool -o -x /sbin/ethtool ]; then
+ if ! LC_ALL=C ip link show dev $1 2>/dev/null| grep -q UP ; then
+ ip link set dev $1 up >/dev/null 2>&1
+ timeout=0
+ while [ $timeout -le 10 ]; do
+ check_mii_tool $1
+ m=$?
+ check_ethtool $1
+ e=$?
+ if [ $m -eq 1 ] || [ $e -eq 1 ] ; then
+ return 1
+ fi
+ if [ $m -eq 2 ] && [ $e -eq 2 ] ; then
+ return 1
+ fi
+ usleep 500000
+ timeout=$((timeout+1))
+ done
+ return 0
+ fi
fi
- fi
- return 1
+ return 1
}
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown Wed Oct 26 18:33:29 2005
@@ -10,33 +10,33 @@
# Will be removed in the future
if is_yes "$NETWORKING" ; then
- if [ -z "$IPV4_NETWORKING" ] ; then
- echo "NETWORKING is set to YES, but IPV4_NETWORKING is empty!"
- echo "Please upgrade your config"
- echo "Assuming you want IPv4 networking"
- IPV4_NETWORKING=yes
- fi
+ if [ -z "$IPV4_NETWORKING" ] ; then
+ echo "NETWORKING is set to YES, but IPV4_NETWORKING is empty!"
+ echo "Please upgrade your config"
+ echo "Assuming you want IPv4 networking"
+ IPV4_NETWORKING=yes
+ fi
fi
DEV=$1
[ -z "$DEV" ] && {
- nls "Usage: %s <device name>" "ifdown" >&2
- exit 1
+ nls "Usage: %s <device name>" "ifdown" >&2
+ exit 1
}
if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
- CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
+ CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
else
- CONFIG="$DEV"
+ CONFIG="$DEV"
fi
if [ "$(id -u)" != "0" ]; then
- if [ -x /sbin/usernetctl ]; then
- exec /sbin/usernetctl $CONFIG down
- fi
- echo "Users cannot control this device." >&2
- exit 1
+ if [ -x /sbin/usernetctl ]; then
+ exec /sbin/usernetctl $CONFIG down
+ fi
+ echo "Users cannot control this device." >&2
+ exit 1
fi
source_config
@@ -48,15 +48,15 @@
# shutdown tleds software
if [ "$TLEDS_DEV" = "$DEVICE" -a -x /usr/bin/tleds ]; then
- /usr/bin/tleds -qk "$DEVICE"
+ /usr/bin/tleds -qk "$DEVICE"
fi
if [ -x $OTHERSCRIPT ]; then
- if [ "$HANDLING" = "0" ]; then
- exec $OTHERSCRIPT $CONFIG $2
- elif [ "$HANDLING" = "1" ]; then
- $OTHERSCRIPT $CONFIG $2
- fi
+ if [ "$HANDLING" = "0" ]; then
+ exec $OTHERSCRIPT $CONFIG $2
+ elif [ "$HANDLING" = "1" ]; then
+ $OTHERSCRIPT $CONFIG $2
+ fi
fi
# Check to make sure the device is actually up
@@ -68,69 +68,69 @@
fi
if [ "$BOOTPROTO" = "dhcp" ]; then
- if [ -x /sbin/dhcpcd ];then
- /sbin/dhcpcd -k ${DEVICE}
- RESULT=$?
- elif [ -x /sbin/dhclient ];then
- if [ -f /var/run/dhclient.pid ];then
- PID=$(cat /var/run/dhclient.pid)
- if ps ax --no-header|grep -q $PID;then
- kill $PID
+ if [ -x /sbin/dhcpcd ];then
+ /sbin/dhcpcd -k ${DEVICE}
RESULT=$?
- fi
- fi
- elif [ -x /sbin/dhcpxd ];then
- /sbin/dhcpxd -k ${DEVICE}
- RESULT=$?
- elif [ -x /sbin/pump ];then
- pump -r -i ${DEVICE}
- RESULT=$?
- fi
- sleep 1
+ elif [ -x /sbin/dhclient ];then
+ if [ -f /var/run/dhclient.pid ];then
+ PID=$(cat /var/run/dhclient.pid)
+ if ps ax --no-header|grep -q $PID;then
+ kill $PID
+ RESULT=$?
+ fi
+ fi
+ elif [ -x /sbin/dhcpxd ];then
+ /sbin/dhcpxd -k ${DEVICE}
+ RESULT=$?
+ elif [ -x /sbin/pump ];then
+ pump -r -i ${DEVICE}
+ RESULT=$?
+ fi
+ sleep 1
fi
if is_wireless_device "${DEVICE}"; then
- if is_yes "${WLAN_WPA}"; then
- killproc --pidfile "wpa_supplicant-${DEVICE}.pid" wpa_supplicant > /dev/null 2>&1
- rm -f "/var/run/wpa_supplicant-${DEVICE}.pid"
- fi
+ if is_yes "${WLAN_WPA}"; then
+ killproc --pidfile "wpa_supplicant-${DEVICE}.pid" wpa_supplicant > /dev/null 2>&1
+ rm -f "/var/run/wpa_supplicant-${DEVICE}.pid"
+ fi
fi
-
+
vlan_setup
if is_yes $ETH_VLANS && `echo $DEVICE | grep -q ^eth` ; then
- if echo "${DEVICE}" | grep -q '\.' ; then
- # vlan down
- ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
- ip link set ${DEVICE} down
- /sbin/vconfig rem ${DEVICE} 2>&1 > /dev/null
- else
- # downujemy interfejs nadrzedny do vlanow
- for VLANDEVICE in `ls /proc/net/vlan 2> /dev/null | grep ^${DEVICE}` ; do
- # najpierw wszystkie vlany po kolei
- ip addr flush dev ${VLANDEVICE} 2>&1 | grep -v "Nothing to flush"
- ip link set ${VLANDEVICE} down
- /sbin/vconfig rem ${VLANDEVICE} 2>&1 > /dev/null
- done
- # a potem dopiero interfejs nadrzedny
+ if echo "${DEVICE}" | grep -q '\.' ; then
+ # vlan down
+ ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
+ ip link set ${DEVICE} down
+ /sbin/vconfig rem ${DEVICE} 2>&1 > /dev/null
+ else
+ # downujemy interfejs nadrzedny do vlanow
+ for VLANDEVICE in `ls /proc/net/vlan 2> /dev/null | grep ^${DEVICE}` ; do
+ # najpierw wszystkie vlany po kolei
+ ip addr flush dev ${VLANDEVICE} 2>&1 | grep -v "Nothing to flush"
+ ip link set ${VLANDEVICE} down
+ /sbin/vconfig rem ${VLANDEVICE} 2>&1 > /dev/null
+ done
+ # a potem dopiero interfejs nadrzedny
+ ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
+ ip link set ${DEVICE} down
+ fi
+else
ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
ip link set ${DEVICE} down
- fi
-else
- ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
- ip link set ${DEVICE} down
-fi
+fi
if [ "$HANDLING" = "4" ]; then
- exit 0
+ exit 0
fi
if [ -n "$RESULT" ] ; then
- if [ "$RESULT" -ne "0" ]; then
- return $RESULT
- fi
+ if [ "$RESULT" -ne "0" ]; then
+ return $RESULT
+ fi
fi
exec /etc/sysconfig/network-scripts/ifdown-post $CONFIG
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown-br
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-br (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown-br Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# ifdown-br - bridge configuration script
-# Copyright (C) 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,12 +29,12 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
if [ ! -x /sbin/brctl ]; then
- nls "%s is missing. Can't continue." "/sbin/brctl"
- exit 1
+ nls "%s is missing. Can't continue." "/sbin/brctl"
+ exit 1
fi
# set all major variables
@@ -42,13 +42,13 @@
# set device down and forget all addresses
for device in ${BRIDGE_DEVS}; do
- ip addr flush dev ${device} 2>&1 | grep -v "Nothing to flush"
- ip link set ${device} down
- brctl delif ${DEVICE} ${device}
+ ip addr flush dev ${device} 2>&1 | grep -v "Nothing to flush"
+ ip link set ${device} down
+ brctl delif ${DEVICE} ${device}
done
ip link set ${DEVICE} down
brctl delbr ${DEVICE}
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown-irda
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-irda (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown-irda Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# ifdown-irda - IrDA configuration script
-# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
. /etc/sysconfig/network
@@ -43,36 +43,36 @@
PID=$(pidof irattach)
for x in $PID; do
- if grep -q "$MODEMPORT" /proc/$x/cmdline; then
- logger -p daemon.info -t ifdown-sl "signal TERM send to \"$(ps -o cmd=$x)\" - this should be irattach"
- kill -TERM $x
- PID=$x
- fi
+ if grep -q "$MODEMPORT" /proc/$x/cmdline; then
+ logger -p daemon.info -t ifdown-sl "signal TERM send to \"$(ps -o cmd=$x)\" - this should be irattach"
+ kill -TERM $x
+ PID=$x
+ fi
done
-
+
if [ -z "$PID" ]; then
- exit 1
+ exit 1
fi
kill $PID > /dev/null 2>&1
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
- exit 0
+ /etc/sysconfig/network-scripts/ifdown-post $1
+ exit 0
fi
sleep 2
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
- exit 0
+ /etc/sysconfig/network-scripts/ifdown-post $1
+ exit 0
fi
kill -KILL $PID > /dev/null 2>&1
if [ -d /proc/$PID ]; then
- logger -p daemon.info -t ifdown-irda "$(nls 'ifdown-%s unable to kill %s for %s' "irda" "irattach" "$DEVICE")" &
+ 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
+ /etc/sysconfig/network-scripts/ifdown-post $1
fi
exit 1
-
+
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown-post
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-post (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown-post Wed Oct 26 18:33:29 2005
@@ -22,21 +22,21 @@
# (QoS) Delete root queueing discipline
if [ -n "${BANDWIDTH_OUT}" ]; then
- if [ "${QDISC_CLASS}" = "htb" -o "${QDISC_CLASS}" = "cbq" ]; then
- tc qdisc del dev ${REALDEVICE} root
- elif [ -z "${QDISC}" -o "${QDISC}" = "tbf" ]; then
- tc qdisc del dev ${REALDEVICE} root
- elif [ -n "${QDISC}" ]; then
- tc qdisc del dev ${REALDEVICE} root
- fi
+ if [ "${QDISC_CLASS}" = "htb" -o "${QDISC_CLASS}" = "cbq" ]; then
+ tc qdisc del dev ${REALDEVICE} root
+ elif [ -z "${QDISC}" -o "${QDISC}" = "tbf" ]; then
+ tc qdisc del dev ${REALDEVICE} root
+ elif [ -n "${QDISC}" ]; then
+ tc qdisc del dev ${REALDEVICE} root
+ fi
else
- if [ -n "${QDISC}" ]; then
- tc qdisc del dev ${REALDEVICE} root
- fi
+ if [ -n "${QDISC}" ]; then
+ tc qdisc del dev ${REALDEVICE} root
+ fi
fi
if [ -n "${BANDWIDTH_IN}" ]; then
- tc qdisc del dev ${REALDEVICE} ingress
+ tc qdisc del dev ${REALDEVICE} ingress
fi
# execute run_down() function (if available in device configuration file)
@@ -48,4 +48,4 @@
exit 0
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown-ppp
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-ppp (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown-ppp Wed Oct 26 18:33:29 2005
@@ -12,8 +12,8 @@
source_config
if [ ! -f /var/run/ppp-$DEVNAME.pid ]; then
- # ppp isn't running, or we didn't start it
- exit 0
+ # ppp isn't running, or we didn't start it
+ exit 0
fi
# set all major variables
@@ -21,7 +21,7 @@
get_ppp_device_and_pid
if [ -z "$PID" ]; then
- exit 1
+ exit 1
fi
rm -f /var/run/ppp-$DEVNAME.pid
@@ -38,14 +38,14 @@
# Special cases
if is_yes "${PPPOA_EAGLE}"; then
- EAGLECTRL="/usr/sbin/adictrl"
- if [ ! -x $EAGLECTRL ]; then
- EAGLECTRL="/usr/sbin/eaglectrl"
- fi
- if [ -x $EAGLECTRL ]; then
- PPPOA_IFACE=$( $EAGLECTRL -i 2>/dev/null)
- [ -n "$PPPOA_IFACE" ] && ip link set "$PPPOA_IFACE" down
- fi
+ EAGLECTRL="/usr/sbin/adictrl"
+ if [ ! -x $EAGLECTRL ]; then
+ EAGLECTRL="/usr/sbin/eaglectrl"
+ fi
+ if [ -x $EAGLECTRL ]; then
+ PPPOA_IFACE=$( $EAGLECTRL -i 2>/dev/null)
+ [ -n "$PPPOA_IFACE" ] && ip link set "$PPPOA_IFACE" down
+ fi
fi
/etc/sysconfig/network-scripts/ifdown-post $1
@@ -53,4 +53,4 @@
exit 1
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown-sl
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-sl (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown-sl Wed Oct 26 18:33:29 2005
@@ -19,17 +19,17 @@
# we can use dip or direct slip connection via slattach
if is_no "$DIRECT_CONNECT"; then
- PID=$(pidof dip-$DEVICE)
+ PID=$(pidof dip-$DEVICE)
else
- PID=$(pidof slattach)
- for x in $PID; do
- if grep -q "$MODEMPORT" /proc/$x/cmdline; then
- logger -p daemon.info -t ifdown-sl \
- "signal TERM send to \"$(ps -o cmd= $x)\" - this should be slattach"
- kill -TERM $x
- PID=$x
- fi
- done
+ PID=$(pidof slattach)
+ for x in $PID; do
+ if grep -q "$MODEMPORT" /proc/$x/cmdline; then
+ logger -p daemon.info -t ifdown-sl \
+ "signal TERM send to \"$(ps -o cmd= $x)\" - this should be slattach"
+ kill -TERM $x
+ PID=$x
+ fi
+ done
fi
#
# The proctitle for connected dip daemons is actually "-dip (ipaddr)"
@@ -37,32 +37,31 @@
# Grab the PID of connected dial-out daemon.
#
if [ -z "$PID" ]; then
- PID=$(pidof -- -dip\ \($IPADDR\))
+ PID=$(pidof -- -dip\ \($IPADDR\))
fi
if [ -z "$PID" ]; then
- exit 1
+ exit 1
fi
kill $PID > /dev/null 2>&1
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
- exit 0
+ /etc/sysconfig/network-scripts/ifdown-post $1
+ exit 0
fi
sleep 2
if [ ! -d /proc/$PID ]; then
- /etc/sysconfig/network-scripts/ifdown-post $1
- exit 0
+ /etc/sysconfig/network-scripts/ifdown-post $1
+ exit 0
fi
kill -KILL $PID > /dev/null 2>&1
if [ -d /proc/$PID ]; then
- logger -p daemon.info -t ifdown-sl "ifdown-sl unable to kill sl-$DEVICE" &
+ logger -p daemon.info -t ifdown-sl "ifdown-sl unable to kill sl-$DEVICE" &
else
- /etc/sysconfig/network-scripts/ifdown-post $1
+ /etc/sysconfig/network-scripts/ifdown-post $1
fi
exit 1
-
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# ifdown-vlan - Virtual LAN configuration script
-# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,12 +30,12 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit 0
+ exit 0
fi
if [ ! -x /sbin/vconfig ]; then
- nls "%s is missing. Can't continue." "/sbin/vconfig"
- exit 1
+ nls "%s is missing. Can't continue." "/sbin/vconfig"
+ exit 1
fi
# set all major variables
@@ -49,4 +49,4 @@
exit $RESULT
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup Wed Oct 26 18:33:29 2005
@@ -10,13 +10,13 @@
# Will be removed in the future
if is_yes "$NETWORKING" ; then
- if [ -z "$IPV4_NETWORKING" ] ; then
- echo "NETWORKING is set to YES, but IPV4_NETWORKING is empty!"
- echo "Please upgrade your config"
- echo "Assuming you want IPv4 networking"
- IPV4_NETWORKING=yes
- export IPV4_NETWORKING
- fi
+ if [ -z "$IPV4_NETWORKING" ] ; then
+ echo "NETWORKING is set to YES, but IPV4_NETWORKING is empty!"
+ echo "Please upgrade your config"
+ echo "Assuming you want IPv4 networking"
+ IPV4_NETWORKING=yes
+ export IPV4_NETWORKING
+ fi
fi
need_hostname
@@ -25,36 +25,36 @@
DEV=$1
[ -z "$DEV" ] && {
- nls "Usage: %s <device name>" "ifup" >&2
- exit 1
+ nls "Usage: %s <device name>" "ifup" >&2
+ exit 1
}
if [ `id -u` != 0 ]; then
- if [ -x /sbin/usernetctl ]; then
- exec /sbin/usernetctl $DEV up
- fi
- nls "Users cannot control this device." >&2
- exit 1
+ if [ -x /sbin/usernetctl ]; then
+ exec /sbin/usernetctl $DEV up
+ fi
+ nls "Users cannot control this device." >&2
+ exit 1
fi
if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
- CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
+ CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
else
- CONFIG="$DEV"
+ CONFIG="$DEV"
fi
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
if [ "foo$2" = "foohotplug" ] && ! is_yes "${HOTPLUG}"; then
- exit
+ exit
fi
if [ "foo$2" = "foopcmcia-hotplug" ] && ! is_yes "${PCMCIA_HOTPLUG}"; then
- exit
+ exit
fi
IPSETUP=no
@@ -65,161 +65,160 @@
OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-${DEVICETYPE}"
if [ -x "$OTHERSCRIPT" ]; then
- if is_yes "$DEFAULTHANDLING" ; then HANDLING=1 ; fi
- if [ "$HANDLING" = "0" ]; then
- exec $OTHERSCRIPT $CONFIG $2
- elif [ "$HANDLING" = "1" ]; then
- $OTHERSCRIPT $CONFIG $2
- fi
+ if is_yes "$DEFAULTHANDLING" ; then
+ HANDLING=1
+ fi
+ if [ "$HANDLING" = "0" ]; then
+ exec $OTHERSCRIPT $CONFIG $2
+ elif [ "$HANDLING" = "1" ]; then
+ $OTHERSCRIPT $CONFIG $2
+ fi
fi
# is this device available? (this catches PCMCIA devices for us)
if ! (/sbin/ip link set multicast ${MULTICAST} dev ${DEVICE} > /dev/null 2>&1); then
- nls "Delaying %s initialization" ${DEVICE}
- exit 1
+ nls "Delaying %s initialization" ${DEVICE}
+ exit 1
fi
if is_yes "$SLAVE" && [ -n "$MASTER" -a -x /sbin/ifenslave ]; then
- RFLAG="" && is_yes "${RECIEVE-ONLY}" && RFLAG="-r"
+ RFLAG="" && is_yes "${RECIEVE-ONLY}" && RFLAG="-r"
- ip link set ${DEVICE} down
- nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
- ifenslave $RFLAG "$MASTER" "$DEVICE"
+ ip link set ${DEVICE} down
+ nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
+ ifenslave $RFLAG "$MASTER" "$DEVICE"
- exit 0
+ exit 0
fi
if [ -n "$MACADDR" ]; then
- ip link set ${DEVICE} address ${MACADDR}
+ ip link set ${DEVICE} address ${MACADDR}
fi
ip link set ${DEVICE} multicast ${MULTICAST} ${ARP} down
if [ -n "$MTU" ]; then
- ip link set ${DEVICE} mtu ${MTU}
+ ip link set ${DEVICE} mtu ${MTU}
fi
if is_yes "${IPV6_NETWORKING}" && is_yes "${IPV6_DISABLE_AUTOCONF}"; then
- run_cmd "Disabling IPv6 autoconfiguration" sysctl -w net.ipv6.conf.${DEVICE}.autoconf=0
+ run_cmd "Disabling IPv6 autoconfiguration" sysctl -w net.ipv6.conf.${DEVICE}.autoconf=0
fi
if is_wireless_device "${DEVICE}"; then
- wireless_param ${DEVICE}
- if is_yes "${WLAN_WPA}"; then
- /usr/sbin/wpa_supplicant -B -w -D ${WLAN_WPA_DRIVER} -c ${WLAN_WPA_CONFIG} -i ${DEVICE} ${WLAN_WPA_OPTIONS} -P "/var/run/wpa_supplicant-${DEVICE}.pid"
- fi
+ wireless_param ${DEVICE}
+ if is_yes "${WLAN_WPA}"; then
+ /usr/sbin/wpa_supplicant -B -w -D ${WLAN_WPA_DRIVER} -c ${WLAN_WPA_CONFIG} -i ${DEVICE} ${WLAN_WPA_OPTIONS} -P "/var/run/wpa_supplicant-${DEVICE}.pid"
+ fi
fi
-
+
if [ "$HANDLING" = "2" ]; then
- exit 0
+ exit 0
fi
if [ -n "$BOOTPROTO" -a "$BOOTPROTO" != "none" -a "$BOOTPROTO" != "static" ]; then
-
- if is_yes "$IPV4_NETWORKING"; then
- if [ "$BOOTPROTO" = "bootp" -o "$BOOTPROTO" = "pump" ]; then
- DHCP_CLIENT=/sbin/pump
- fi
-
- if [ -z "$DHCP_CLIENT" ]; then
- if [ -x /sbin/dhcpcd ]; then
- DHCP_CLIENT=/sbin/dhcpcd
- elif [ -x /sbin/dhclient ]; then
- DHCP_CLIENT=/sbin/dhclient
- elif [ -x /sbin/dhcpxd ]; then
- DHCP_CLIENT=/sbin/dhcpxd
- elif [ -x /sbin/pump ]; then
- DHCP_CLIENT=/sbin/pump
- else
- nls "Can't find a dhcp client."
- exit 1
- fi
- fi
-
- DHCP_ARGS=
- if [ -n "$DHCP_CLIENT" ]; then
- case $(basename $DHCP_CLIENT) in
- pump)
- [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-h $DHCP_HOSTNAME"
- DHCP_ARGS="$DHCP_ARGS -i $DEVICE"
- ;;
- dhcpcd)
- [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-h $DHCP_HOSTNAME"
- DHCP_ARGS="$DHCP_ARGS $DEVICE"
- ;;
- dhcpxd)
- [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-H $DHCP_HOSTNAME"
- DHCP_ARGS="$DHCP_ARGS $DEVICE"
- ;;
- dhclient)
- # Can't specify a host with dhclient ?
- DHCP_ARGS="$DEVICE"
- ;;
- esac
- fi
- DHCP_ARGS="$DHCP_OPTIONS $DHCP_ARGS"
-
- if check_link_down ${DEVICE}; then
- run_cmd "$(nls 'Determining IP information for %s (%s)' "$DEVICE" "$(basename $DHCP_CLIENT)")" /bin/false
- nls '%s: Check cable?' "$DEVICE"
- exit 1
- fi
-
- if ! run_cmd "$(nls 'Determining IP information for %s (%s)' "$DEVICE" "$(basename $DHCP_CLIENT)")" $DHCP_CLIENT $DHCP_ARGS ; then
- exit 1
- fi
-
- # give time for determining IP information
- check_device_down && sleep 1 && check_device_down && sleep 3
- check_device_down && ip link set ${DEVICE} up
- fi
-
+ if is_yes "$IPV4_NETWORKING"; then
+ if [ "$BOOTPROTO" = "bootp" -o "$BOOTPROTO" = "pump" ]; then
+ DHCP_CLIENT=/sbin/pump
+ fi
+
+ if [ -z "$DHCP_CLIENT" ]; then
+ if [ -x /sbin/dhcpcd ]; then
+ DHCP_CLIENT=/sbin/dhcpcd
+ elif [ -x /sbin/dhclient ]; then
+ DHCP_CLIENT=/sbin/dhclient
+ elif [ -x /sbin/dhcpxd ]; then
+ DHCP_CLIENT=/sbin/dhcpxd
+ elif [ -x /sbin/pump ]; then
+ DHCP_CLIENT=/sbin/pump
+ else
+ nls "Can't find a dhcp client."
+ exit 1
+ fi
+ fi
+
+ DHCP_ARGS=
+ if [ -n "$DHCP_CLIENT" ]; then
+ case $(basename $DHCP_CLIENT) in
+ pump)
+ [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-h $DHCP_HOSTNAME"
+ DHCP_ARGS="$DHCP_ARGS -i $DEVICE"
+ ;;
+ dhcpcd)
+ [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-h $DHCP_HOSTNAME"
+ DHCP_ARGS="$DHCP_ARGS $DEVICE"
+ ;;
+ dhcpxd)
+ [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-H $DHCP_HOSTNAME"
+ DHCP_ARGS="$DHCP_ARGS $DEVICE"
+ ;;
+ dhclient)
+ # Can't specify a host with dhclient ?
+ DHCP_ARGS="$DEVICE"
+ ;;
+ esac
+ fi
+ DHCP_ARGS="$DHCP_OPTIONS $DHCP_ARGS"
+
+ if check_link_down ${DEVICE}; then
+ run_cmd "$(nls 'Determining IP information for %s (%s)' "$DEVICE" "$(basename $DHCP_CLIENT)")" /bin/false
+ nls '%s: Check cable?' "$DEVICE"
+ exit 1
+ fi
+
+ if ! run_cmd "$(nls 'Determining IP information for %s (%s)' "$DEVICE" "$(basename $DHCP_CLIENT)")" $DHCP_CLIENT $DHCP_ARGS ; then
+ exit 1
+ fi
+
+ # give time for determining IP information
+ check_device_down && sleep 1 && check_device_down && sleep 3
+ check_device_down && ip link set ${DEVICE} up
+ fi
else
+ # IPv4 in use ?
+ if is_yes "$IPV4_NETWORKING" && [ -n "${IP4ADDR}" ] ; then
+ # If broadcast is missing then autocalculate it
+ if ! (echo $IP4ADDROPT | egrep -q "brd|broadcast"); then
+ IP4ADDROPT="brd + ${IP4ADDROPT}"
+ fi
+
+ if [ -n "$REMIP" ]; then
+ ip addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE} ${IP4ADDROPT}
+ else
+ ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
+ fi
+ fi
+
+ # Set device up
+ ip link set ${DEVICE} up
+
+ # IPv6 in use ?
+ if is_yes "$IPV6_NETWORKING" && [ -n "${IP6ADDR}" ] ; then
+ ip addr add ${IP6ADDR} dev ${DEVICE} ${IP6ADDROPT}
+ fi
- # IPv4 in use ?
- if is_yes "$IPV4_NETWORKING" && [ -n "${IP4ADDR}" ] ; then
- # If broadcast is missing then autocalculate it
- if ! (echo $IP4ADDROPT | egrep -q "brd|broadcast"); then
- IP4ADDROPT="brd + ${IP4ADDROPT}"
- fi
-
- if [ -n "$REMIP" ]; then
- ip addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE} ${IP4ADDROPT}
- else
- ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
- fi
- fi
-
- # Set device up
- ip link set ${DEVICE} up
-
- # IPv6 in use ?
- if is_yes "$IPV6_NETWORKING" && [ -n "${IP6ADDR}" ] ; then
- ip addr add ${IP6ADDR} dev ${DEVICE} ${IP6ADDROPT}
- fi
-
- # IPv4/6 gateways and default routes
- setup_ip_gw_ro
+ # IPv4/6 gateways and default routes
+ setup_ip_gw_ro
fi
# device have to have ip address set before
if is_yes "$PROXYARP"; then
- run_cmd "$(nls 'Enabling proxy ARP on %s' "${DEVICE}")" sysctl -w net.ipv4.conf.${DEVICE}.proxy_arp=1
+ run_cmd "$(nls 'Enabling proxy ARP on %s' "${DEVICE}")" sysctl -w net.ipv4.conf.${DEVICE}.proxy_arp=1
fi
if [ "$HANDLING" = "3" ]; then
- exit 0
+ exit 0
fi
if is_yes "$IPX"; then
- /etc/sysconfig/network-scripts/ifup-ipx $DEVICE
+ /etc/sysconfig/network-scripts/ifup-ipx $DEVICE
fi
if [ "$HANDLING" = "4" ]; then
- exit 0
+ exit 0
fi
exec /etc/sysconfig/network-scripts/ifup-post $CONFIG
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases Wed Oct 26 18:33:29 2005
@@ -12,105 +12,104 @@
DEV=$1
[ -z "$DEV" ] && {
- nls "Usage: %s <device name>" "ifup-aliases" >&2
- exit 1
+ nls "Usage: %s <device name>" "ifup-aliases" >&2
+ exit 1
}
if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
- CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
+ CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
else
- CONFIG="$DEV"
+ CONFIG="$DEV"
fi
source_config
# set all major variables
setup_ip_param
-
+
# Add all addresses
for IP_ADDR in $IPADDR_ALIASES; do
- IP_ADDR_OPT=""
- IP_ROUTE_OPT=""
-
- [ -z "$IP_ADDR" ] && continue
- # Be sure that primary address is added
- if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
- if (ip addr show dev $DEVICE | egrep -q "[[:space:]]${IP_ADDR}[[:space:]]"); then
- continue
- fi
- fi
- if is_yes "${IPV4_NETWORKING}"; then
- # If broadcast is missing then autocalculate it
- if ! (echo $IP_ADDR_OPT | egrep -q "brd|broadcast"); then
- IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
+ IP_ADDR_OPT=""
+ IP_ROUTE_OPT=""
+
+ [ -z "$IP_ADDR" ] && continue
+ # Be sure that primary address is added
+ if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
+ if (ip addr show dev $DEVICE | egrep -q "[[:space:]]${IP_ADDR}[[:space:]]"); then
+ continue
+ fi
+ fi
+ if is_yes "${IPV4_NETWORKING}"; then
+ # If broadcast is missing then autocalculate it
+ if ! (echo $IP_ADDR_OPT | egrep -q "brd|broadcast"); then
+ IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
+ fi
+ ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
fi
- ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
- fi
done
for IP_ADDR in $IPV6_ADDR; do
- IP_ADDR_OPT=""
- IP_ROUTE_OPT=""
-
- [ -z "$IP_ADDR" ] && continue
- # Be sure that primary address is added
- if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
- if (ip addr show dev $DEVICE | egrep -q "[[:space:]]${IP_ADDR}[[:space:]]"); then
- continue
- fi
- fi
- # Check for IPv6 address
- if (echo $IP_ADDR | grep -q ":"); then
- if is_yes "${IPV6_NETWORKING}"; then
- ip -6 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
- fi
- elif is_yes "${IPV4_NETWORKING}"; then
- # If broadcast is missing then autocalculate it
- if ! (echo $IP_ADDR_OPT | egrep -q "brd|broadcast"); then
- IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
+ IP_ADDR_OPT=""
+ IP_ROUTE_OPT=""
+
+ [ -z "$IP_ADDR" ] && continue
+ # Be sure that primary address is added
+ if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
+ if (ip addr show dev $DEVICE | egrep -q "[[:space:]]${IP_ADDR}[[:space:]]"); then
+ continue
+ fi
+ fi
+ # Check for IPv6 address
+ if (echo $IP_ADDR | grep -q ":"); then
+ if is_yes "${IPV6_NETWORKING}"; then
+ ip -6 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
+ fi
+ elif is_yes "${IPV4_NETWORKING}"; then
+ # If broadcast is missing then autocalculate it
+ if ! (echo $IP_ADDR_OPT | egrep -q "brd|broadcast"); then
+ IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
+ fi
+ ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
fi
- ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
- fi
done
for nr in $(awk 'BEGIN { for (j=1; j<256; j++) print j}'); do
- eval IP_ADDR="\$IPADDR${nr}"
- eval IP_ADDR_OPT="\$IP_AOPTS${nr}"
- eval IP_ROUTE_OPT="\$IP_ROPTS${nr}"
-
- [ -z "$IP_ADDR" ] && continue
- # Be sure that primary address is added
- if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
- if (ip addr show dev $DEVICE | egrep -q "[[:space:]]${IP_ADDR}[[:space:]]"); then
- continue
- fi
- fi
- # Check for IPv6 address
- if (echo $IP_ADDR | grep -q ":"); then
- if is_yes "${IPV6_NETWORKING}"; then
- ip -6 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
- fi
- elif is_yes "${IPV4_NETWORKING}"; then
- # If broadcast is missing then autocalculate it
- if ! (echo $IP_ADDR_OPT | egrep -q "brd|broadcast"); then
- IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
+ eval IP_ADDR="\$IPADDR${nr}"
+ eval IP_ADDR_OPT="\$IP_AOPTS${nr}"
+ eval IP_ROUTE_OPT="\$IP_ROPTS${nr}"
+
+ [ -z "$IP_ADDR" ] && continue
+ # Be sure that primary address is added
+ if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
+ if (ip addr show dev $DEVICE | egrep -q "[[:space:]]${IP_ADDR}[[:space:]]"); then
+ continue
+ fi
+ fi
+ # Check for IPv6 address
+ if (echo $IP_ADDR | grep -q ":"); then
+ if is_yes "${IPV6_NETWORKING}"; then
+ ip -6 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
+ fi
+ elif is_yes "${IPV4_NETWORKING}"; then
+ # If broadcast is missing then autocalculate it
+ if ! (echo $IP_ADDR_OPT | egrep -q "brd|broadcast"); then
+ IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
+ fi
+ ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
fi
- ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
- fi
done
# Setup IPv4-compatible addresses
if is_yes "$IPV6_NETWORKING" && [ "$BOOTPROTO6" = "v4compat" ]; then
- # enable automatic tunnels
- ip link set sit0 up
+ # enable automatic tunnels
+ ip link set sit0 up
- # add v4compat addresses to device
- for addr in $(ip -4 addr show scope global dev $DEVICE | \
- awk '/inet/ { print $2 }' | awk -F"/" '{ print $1 }'); do
- ip -6 addr add ::$addr dev $DEVICE
- done
+ # add v4compat addresses to device
+ for addr in $(ip -4 addr show scope global dev $DEVICE | \
+ awk '/inet/ { print $2 }' | awk -F"/" '{ print $1 }'); do
+ ip -6 addr add ::$addr dev $DEVICE
+ done
fi
-
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-br
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-br (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-br Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# ifup-br - bridge configuration script
-# Copyright (C) 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,12 +29,12 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
if [ ! -x /sbin/brctl ]; then
- nls "%s is missing. Can't continue." "/sbin/brctl"
- exit 1
+ nls "%s is missing. Can't continue." "/sbin/brctl"
+ exit 1
fi
# load bridge module
@@ -45,24 +45,24 @@
# set device down and forget all addresses
for device in $BRIDGE_DEVS; do
- ip link set ${device} down
- ip addr flush dev ${device} 2>&1 | grep -v "Nothing to flush"
+ ip link set ${device} down
+ ip addr flush dev ${device} 2>&1 | grep -v "Nothing to flush"
done
# set wireless parameters
for device in $BRIDGE_DEVS; do
- if is_wireless_device "${device}"; then
- wireless_param "${device}" "br"
- fi
+ if is_wireless_device "${device}"; then
+ wireless_param "${device}" "br"
+ fi
done
brctl addbr ${DEVICE}
# add interfaces to bridge
for device in $BRIDGE_DEVS; do
- brctl addif ${DEVICE} ${device}
- ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
- ip link set ${device} up
+ brctl addif ${DEVICE} ${device}
+ ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
+ ip link set ${device} up
done
@@ -72,22 +72,22 @@
# spanning tree protocol
if is_yes "$SPANNING_TREE"; then
- brctl stp ${DEVICE} yes
- [ -n "$BRIDGEPRIO" ] && brctl bridgeprio ${DEVICE} "$BRIDGEPRIO"
- [ -n "$FD" ] && brctl fd ${DEVICE} "$FD"
- [ -n "$HELLO" ] && brctl hello ${DEVICE} "$HELLO"
- [ -n "$MAXAGE" ] && brctl maxage ${DEVICE} "$MAXAGE"
- [ -n "$PATHCOST" -a -n "$PATHCOST_PORT" ] && brctl pathcost ${DEVICE} "$PATHCOST_PORT" "$PATHCOST"
- [ -n "$PORTPRIO" -a -n "$PORTPRIO_PORT" ] && brctl portprio ${DEVICE} "$PORTPRIO_PORT" "$PORTPRIO"
+ brctl stp ${DEVICE} yes
+ [ -n "$BRIDGEPRIO" ] && brctl bridgeprio ${DEVICE} "$BRIDGEPRIO"
+ [ -n "$FD" ] && brctl fd ${DEVICE} "$FD"
+ [ -n "$HELLO" ] && brctl hello ${DEVICE} "$HELLO"
+ [ -n "$MAXAGE" ] && brctl maxage ${DEVICE} "$MAXAGE"
+ [ -n "$PATHCOST" -a -n "$PATHCOST_PORT" ] && brctl pathcost ${DEVICE} "$PATHCOST_PORT" "$PATHCOST"
+ [ -n "$PORTPRIO" -a -n "$PORTPRIO_PORT" ] && brctl portprio ${DEVICE} "$PORTPRIO_PORT" "$PORTPRIO"
else
- brctl stp ${DEVICE} no
+ brctl stp ${DEVICE} no
fi
-
+
ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
if ! (ip link set dev ${DEVICE} up); then
- nls "problems with setting bridge %s" "${DEVICE}"
- exit 1
+ nls "problems with setting bridge %s" "${DEVICE}"
+ exit 1
fi
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-ipx
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-ipx (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-ipx Wed Oct 26 18:33:29 2005
@@ -11,17 +11,17 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
if [ "$1" = "" ]; then
- nls "Usage: %s <device name>" "ifup-ipx" >&2
- exit 1
+ nls "Usage: %s <device name>" "ifup-ipx" >&2
+ exit 1
fi
if is_no "$IPX"; then
- exit 0
+ exit 0
fi
if [ ! -x /sbin/ipx_interface ] ; then
- nls "%s is missing. Can't continue." "/sbin/ipx_interface"
- exit 1
+ nls "%s is missing. Can't continue." "/sbin/ipx_interface"
+ exit 1
fi
cd /etc/sysconfig/network-scripts
@@ -35,22 +35,21 @@
# add ipx for all frame types
for frametype in '802.2' '802.2TR' '802.3' 'EtherII' 'SNAP'; do
- framename=$(echo $frametype | awk ' { gsub(/\./,"_"); print $0 } ')
- case $(eval echo $(echo \$`echo IPXACTIVE_$framename`)) in
- yes|true)
- case $(eval echo $(echo \$`echo IPXPRIMARY_$framename`)) in
- yes|true) primary="-p" ;;
- *) primary= ;;
- esac
-
- ip link set $DEVICE up
- /sbin/ipx_interface add $primary $DEVICE $frametype \
- $(eval echo $(echo \$`echo IPXNETNUM_$framename`))
- ;;
- esac
+ framename=$(echo $frametype | awk ' { gsub(/\./,"_"); print $0 } ')
+ case $(eval echo $(echo \$`echo IPXACTIVE_$framename`)) in
+ yes|true)
+ case $(eval echo $(echo \$`echo IPXPRIMARY_$framename`)) in
+ yes|true) primary="-p" ;;
+ *) primary= ;;
+ esac
+ ip link set $DEVICE up
+ /sbin/ipx_interface add $primary $DEVICE $frametype \
+ $(eval echo $(echo \$`echo IPXNETNUM_$framename`))
+ ;;
+ esac
done
exit 0
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-irda
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-irda (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-irda Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# ifup-irda - IrDA configuration script
-# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,12 +30,12 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
if [ ! -x /sbin/irattach ]; then
- nls "%s is missing. Can't continue." "/sbin/irattach"
- exit 1
+ nls "%s is missing. Can't continue." "/sbin/irattach"
+ exit 1
fi
. /etc/sysconfig/network
@@ -46,20 +46,20 @@
IRDAOPTS=
if [ -n "${DONGLE}" ]; then
- IRDAOPTS="${IRDAOPTS} -d ${DONGLE}"
+ IRDAOPTS="${IRDAOPTS} -d ${DONGLE}"
fi
if is_yes "${DISCOVERY}" || [ -z "${DISCOVERY}" ]; then
- IRDAOPTS="${IRDAOPTS} -s"
+ IRDAOPTS="${IRDAOPTS} -s"
fi
/sbin/irattach ${IRDAPORT} ${IRDAOPTS}
-
+
ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}
if ! (ip link set dev ${DEVICE} up); then
- nls "problems with setting %s %s" "IrDA" "${DEVICE}"
- exit 1
+ nls "problems with setting %s %s" "IrDA" "${DEVICE}"
+ exit 1
fi
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-iucv
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-iucv (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-iucv Wed Oct 26 18:33:29 2005
@@ -13,22 +13,22 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
# set all major variables
setup_ip_param
if is_yes "$IPV4_NETWORKING"; then
- if [ -n "$IP4ADDR" ]; then
- ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
- fi
+ if [ -n "$IP4ADDR" ]; then
+ ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
+ fi
fi
if is_yes "$IPV6_NETWORKING"; then
- if [ -n "$IP6ADDR" ]; then
- ip -6 addr add ${IP6ADDR} dev ${DEVICE}
- fi
+ if [ -n "$IP6ADDR" ]; then
+ ip -6 addr add ${IP6ADDR} dev ${DEVICE}
+ fi
fi
ip link set dev ${DEVICE} up
@@ -41,4 +41,4 @@
/etc/sysconfig/network-scripts/ifup-post $1
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh Wed Oct 26 18:33:29 2005
@@ -11,20 +11,20 @@
DEV=$1
if [ -z "$DEV" ]; then
- nls "Usage: %s <device name>" "ifup-neigh" >&2
- exit 1
+ nls "Usage: %s <device name>" "ifup-neigh" >&2
+ exit 1
fi
if [ ! -f /etc/sysconfig/static-arp ]; then
- exit 0
+ exit 0
fi
if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
- CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
+ CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
else
- CONFIG="$DEV"
+ CONFIG="$DEV"
fi
-
+
source_config
# set all major variables
@@ -34,13 +34,12 @@
# note the trailing white space character in the grep gets rid of aliases
egrep "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-arp | while read iface mac ip state args; do
- if is_no "$IPV4_NETWORKING"; then
- continue
- fi
- [ -z "$state" ] && state="stale"
- /sbin/ip neigh replace $ip lladdr $mac nud $state dev $DEVICE
+ if is_no "$IPV4_NETWORKING"; then
+ continue
+ fi
+ [ -z "$state" ] && state="stale"
+ /sbin/ip neigh replace $ip lladdr $mac nud $state dev $DEVICE
done
-
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-plip
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-plip (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-plip Wed Oct 26 18:33:29 2005
@@ -12,22 +12,22 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
# set all major variables
setup_ip_param
if is_yes "$IPV4_NETWORKING"; then
- if [ -n "$IP4ADDR" ]; then
- ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
- fi
+ if [ -n "$IP4ADDR" ]; then
+ ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
+ fi
fi
if is_yes "$IPV6_NETWORKING"; then
- if [ -n "$IP6ADDR" ]; then
- ip -6 addr add ${IP6ADDR} dev ${DEVICE}
- fi
+ if [ -n "$IP6ADDR" ]; then
+ ip -6 addr add ${IP6ADDR} dev ${DEVICE}
+ fi
fi
ip link set dev ${DEVICE} up
@@ -40,4 +40,4 @@
/etc/sysconfig/network-scripts/ifup-post $1
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-plusb
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-plusb (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-plusb Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# The plusb network driver is a USB host-host cable based on the Prolific
-# chip. It works a lot like the plip driver.
+# chip. It works a lot like the plip driver.
#
# To get the plusb module to load automatically at boot, you will need to
# add the following lines to /etc/conf.modules:
@@ -21,22 +21,22 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
# set all major variables
setup_ip_param
if is_yes "$IPV4_NETWORKING"; then
- if [ -n "$IP4ADDR" ]; then
- ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
- fi
+ if [ -n "$IP4ADDR" ]; then
+ ip -4 addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE}
+ fi
fi
if is_yes "$IPV6_NETWORKING"; then
- if [ -n "$IP6ADDR" ]; then
- ip -6 addr add ${IP6ADDR} dev ${DEVICE}
- fi
+ if [ -n "$IP6ADDR" ]; then
+ ip -6 addr add ${IP6ADDR} dev ${DEVICE}
+ fi
fi
ip link set dev ${DEVICE} up
@@ -49,4 +49,4 @@
/etc/sysconfig/network-scripts/ifup-post $1
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-post
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-post (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-post Wed Oct 26 18:33:29 2005
@@ -21,35 +21,35 @@
# Simple QoS support (bandwidth limit)
if [ -n "${BANDWIDTH_OUT}" ]; then
- if [ "${QDISC_CLASS}" = "htb" -o "${QDISC_CLASS}" = "cbq" ]; then
- case "${QDISC_CLASS}" in
- htb)
- tc qdisc add dev ${REALDEVICE} root handle 1: htb default 10
- tc class add dev ${REALDEVICE} parent 1: classid 1:10 htb rate ${BANDWIDTH_OUT}kbit ceil ${BANDWIDTH_OUT}kbit
- [ -n "${QDISC}" ] && tc qdisc add dev ${REALDEVICE} parent 1:10 ${QDISC}
- ;;
- cbq)
- # FIXME: hardcoded ethernet speed (bandwidth)
- tc qdisc add dev ${REALDEVICE} root handle 1: cbq bandwidth 100000kbit cell 8 avpkt 1000 mpu 64
- tc class add dev ${REALDEVICE} parent 1: classid 1:10 cbq bandwidth 100000kbit rate ${BANDWIDTH_OUT}kbit maxburst 5 avpkt 1000 allot 1514 bounded
- [ -n "${QDISC}" ] && tc qdisc add dev ${REALDEVICE} parent 1:10 ${QDISC}
- tc filter add dev ${REALDEVICE} protocol ip parent 1: u32 match ip src 0.0.0.0/0 flowid 1:10
- ;;
- esac
- elif [ -z "${QDISC}" -o "${QDISC}" = "tbf" ]; then
- tc qdisc add dev ${REALDEVICE} root tbf rate ${BANDWIDTH_OUT}kbit latency 50ms burst 51200
- elif [ -n "${QDISC}" ]; then
- tc qdisc add dev ${REALDEVICE} root ${QDISC}
- fi
+ if [ "${QDISC_CLASS}" = "htb" -o "${QDISC_CLASS}" = "cbq" ]; then
+ case "${QDISC_CLASS}" in
+ htb)
+ tc qdisc add dev ${REALDEVICE} root handle 1: htb default 10
+ tc class add dev ${REALDEVICE} parent 1: classid 1:10 htb rate ${BANDWIDTH_OUT}kbit ceil ${BANDWIDTH_OUT}kbit
+ [ -n "${QDISC}" ] && tc qdisc add dev ${REALDEVICE} parent 1:10 ${QDISC}
+ ;;
+ cbq)
+ # FIXME: hardcoded ethernet speed (bandwidth)
+ tc qdisc add dev ${REALDEVICE} root handle 1: cbq bandwidth 100000kbit cell 8 avpkt 1000 mpu 64
+ tc class add dev ${REALDEVICE} parent 1: classid 1:10 cbq bandwidth 100000kbit rate ${BANDWIDTH_OUT}kbit maxburst 5 avpkt 1000 allot 1514 bounded
+ [ -n "${QDISC}" ] && tc qdisc add dev ${REALDEVICE} parent 1:10 ${QDISC}
+ tc filter add dev ${REALDEVICE} protocol ip parent 1: u32 match ip src 0.0.0.0/0 flowid 1:10
+ ;;
+ esac
+ elif [ -z "${QDISC}" -o "${QDISC}" = "tbf" ]; then
+ tc qdisc add dev ${REALDEVICE} root tbf rate ${BANDWIDTH_OUT}kbit latency 50ms burst 51200
+ elif [ -n "${QDISC}" ]; then
+ tc qdisc add dev ${REALDEVICE} root ${QDISC}
+ fi
else
- if [ -n "${QDISC}" ]; then
- tc qdisc add dev ${REALDEVICE} root ${QDISC}
- fi
+ if [ -n "${QDISC}" ]; then
+ tc qdisc add dev ${REALDEVICE} root ${QDISC}
+ fi
fi
if [ -n "${BANDWIDTH_IN}" ]; then
- tc qdisc add dev ${REALDEVICE} handle ffff: ingress
- 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
+ tc qdisc add dev ${REALDEVICE} handle ffff: ingress
+ 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 ${CONFIG}
@@ -58,14 +58,14 @@
# don't set hostname on ppp/slip connections
if [ -n "$NEEDHOSTNAME" -a "${DEVICETYPE}" != "ppp" -a "${DEVICETYPE}" != "slip" ]; then
- IPADDR=$(ip -f inet addr show dev ${DEVICE} |
- awk '/inet/ { print $2 }' |awk -F"/" '{ print $1 }')
- eval $(/bin/ipcalc --silent --hostname ${IPADDR}) && set_hostname $HOSTNAME
+ IPADDR=$(ip -f inet addr show dev ${DEVICE} |
+ awk '/inet/ { print $2 }' |awk -F"/" '{ print $1 }')
+ eval $(/bin/ipcalc --silent --hostname ${IPADDR}) && set_hostname $HOSTNAME
fi
# run tleds software
if [ "$TLEDS_DEV" = "$DEVICE" -a -x /usr/bin/tleds ]; then
- /usr/bin/tleds -qc "$DEVICE"
+ /usr/bin/tleds -qc "$DEVICE"
fi
# execute run_up() function (if available in device configuration file)
@@ -77,4 +77,4 @@
exit 0
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-ppp Wed Oct 26 18:33:29 2005
@@ -29,15 +29,15 @@
setup_ip_param
if [ "$2" = "boot" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
if [ ! -x /usr/sbin/pppd ]; then
- nls "%s does not exist or is not executable" "/usr/sbin/pppd"
- nls "%s for %s exiting" "ifup-ppp" "$DEVICE"
- logger -p daemon.info -t ifup-ppp \
- "$(nls '%s does not exist or is not executable for %s' \
- "/usr/sbin/pppd" "$DEVICE")"
- exit 1
+ nls "%s does not exist or is not executable" "/usr/sbin/pppd"
+ nls "%s for %s exiting" "ifup-ppp" "$DEVICE"
+ logger -p daemon.info -t ifup-ppp \
+ "$(nls '%s does not exist or is not executable for %s' \
+ "/usr/sbin/pppd" "$DEVICE")"
+ exit 1
fi
# modprobe ppp modules (udev and devfsd case)
@@ -45,205 +45,202 @@
opts="lock"
-if [ -z "${REPORTFILE}" ] ; then
- REPORTFILE=/dev/null
+if [ -z "${REPORTFILE}" ] ; then
+ REPORTFILE=/dev/null
fi
if [ -n "${PPPOE_DEV}" ]; then
- if is_yes "${PPPOE_KERNEL}"; then
- modprobe -s -k pppoe
- MODEMMODE="plugin rp-pppoe.so"
- MODEMPORT="${PPPOE_DEV}"
- else
- MODEMMODE="pty"
- MODEMPORT="pppoe -I ${PPPOE_DEV} ${PPPOE_OPT}"
- fi
+ if is_yes "${PPPOE_KERNEL}"; then
+ modprobe -s -k pppoe
+ MODEMMODE="plugin rp-pppoe.so"
+ MODEMPORT="${PPPOE_DEV}"
+ else
+ MODEMMODE="pty"
+ MODEMPORT="pppoe -I ${PPPOE_DEV} ${PPPOE_OPT}"
+ fi
elif is_yes "${PPPOA_EAGLE}"; then
- EAGLECTRL="/usr/sbin/adictrl"
- if [ ! -x $EAGLECTRL ]; then
- EAGLECTRL="/usr/sbin/eaglectrl"
- fi
- if [ ! -x $EAGLECTRL ]; then
- nls "%s does not exist or is not executable" "$EAGLECTRL"
- nls "%s for %s exiting" "ifup-ppp" "$DEVICE"
- exit 1
- fi
- $EAGLECTRL -w
- PPPOA_IFACE=$( $EAGLECTRL -i 2>/dev/null)
- if [ -z "$PPPOA_IFACE" ]; then
- PPPOA_IFACE="(unknown)"
- else
- ip link set "$PPPOA_IFACE" up
- fi
- MODEMMODE="pty"
- MODEMPORT="pppoa -I ${PPPOA_IFACE} ${PPPOA_OPT}"
-elif is_yes "${PPPOA_SPEEDTOUCH}"; then
- if is_yes "${PPPOA_KERNEL}"; then
- modprobe -s -k speedtch
- modprobe -s -k pppoatm
- modem_run -k -s -f "${PPPOA_FIRMWARE}"
- MODEMMODE="plugin pppoatm.so"
- MODEMPORT="${PPPOA_VPI}.${PPPOA_VCI}"
- else
- modem_run -s -f "${PPPOA_FIRMWARE}"
+ EAGLECTRL="/usr/sbin/adictrl"
+ if [ ! -x $EAGLECTRL ]; then
+ EAGLECTRL="/usr/sbin/eaglectrl"
+ fi
+ if [ ! -x $EAGLECTRL ]; then
+ nls "%s does not exist or is not executable" "$EAGLECTRL"
+ nls "%s for %s exiting" "ifup-ppp" "$DEVICE"
+ exit 1
+ fi
+ $EAGLECTRL -w
+ PPPOA_IFACE=$( $EAGLECTRL -i 2>/dev/null)
+ if [ -z "$PPPOA_IFACE" ]; then
+ PPPOA_IFACE="(unknown)"
+ else
+ ip link set "$PPPOA_IFACE" up
+ fi
MODEMMODE="pty"
- MODEMPORT="pppoa3 -v1 -c -vpi ${PPPOA_VPI} -vci ${PPPOA_VCI} ${PPPOA_OPT}"
- fi
+ MODEMPORT="pppoa -I ${PPPOA_IFACE} ${PPPOA_OPT}"
+elif is_yes "${PPPOA_SPEEDTOUCH}"; then
+ if is_yes "${PPPOA_KERNEL}"; then
+ modprobe -s -k speedtch
+ modprobe -s -k pppoatm
+ modem_run -k -s -f "${PPPOA_FIRMWARE}"
+ MODEMMODE="plugin pppoatm.so"
+ MODEMPORT="${PPPOA_VPI}.${PPPOA_VCI}"
+ else
+ modem_run -s -f "${PPPOA_FIRMWARE}"
+ MODEMMODE="pty"
+ MODEMPORT="pppoa3 -v1 -c -vpi ${PPPOA_VPI} -vci ${PPPOA_VCI} ${PPPOA_OPT}"
+ fi
else
- if is_no "${DIRECT_CONNECT}" || [ -z "${DIRECT_CONNECT}" ]; then
-
- PEERCONF=/etc/ppp/peers/${DEVNAME}
-
- if [ ! -f ${PEERCONF} ]; then
- if [ -z "${WVDIALSECT}" ]; then
- # XXX: REPORTFILE support is problematic here --misiek
- [ -f "${CHATSCRIPT}" ] || CHATSCRIPT=/etc/sysconfig/interfaces/data/chat-${PARENTDEVNAME}
- if [ ! -f "${CHATSCRIPT}" ]; then
- nls '%s does not exist' "${CHATSCRIPT}"
- nls 'ifup-ppp for %s exiting' "${DEVNAME}"
- logger -p daemon.info -t ifup-ppp \
- "$(nls '%s does not exist for %s' "${CHATSCRIPT}" "${DEVICE}")"
- exit 1
- fi
- fi
- logger -s -p daemon.notice -t ifup-ppp "$(nls '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 --chat ${WVDIALSECT} --config /etc/wvdial.conf >> ${REPORTFILE} 2>&1 \"" >> ${PEERCONF}
- else
- if is_yes "${DEBUG}"; then
- chatdbg="-v"
- fi
- if [ -n "${DATAFORCHAT}" ]; then
- chatreadenv=-E
+ if is_no "${DIRECT_CONNECT}" || [ -z "${DIRECT_CONNECT}" ]; then
+ PEERCONF=/etc/ppp/peers/${DEVNAME}
+ if [ ! -f ${PEERCONF} ]; then
+ if [ -z "${WVDIALSECT}" ]; then
+ # XXX: REPORTFILE support is problematic here --misiek
+ [ -f "${CHATSCRIPT}" ] || CHATSCRIPT=/etc/sysconfig/interfaces/data/chat-${PARENTDEVNAME}
+ if [ ! -f "${CHATSCRIPT}" ]; then
+ nls '%s does not exist' "${CHATSCRIPT}"
+ nls 'ifup-ppp for %s exiting' "${DEVNAME}"
+ logger -p daemon.info -t ifup-ppp \
+ "$(nls '%s does not exist for %s' "${CHATSCRIPT}" "${DEVICE}")"
+ exit 1
+ fi
+ fi
+ logger -s -p daemon.notice -t ifup-ppp "$(nls '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 --chat ${WVDIALSECT} --config /etc/wvdial.conf >> ${REPORTFILE} 2>&1 \"" >> ${PEERCONF}
+ else
+ if is_yes "${DEBUG}"; then
+ chatdbg="-v"
+ fi
+ if [ -n "${DATAFORCHAT}" ]; then
+ chatreadenv=-E
+ fi
+ echo "connect \"/usr/sbin/chat $chatreadenv -f ${CHATSCRIPT} -r ${REPORTFILE} ${chatdbg}\"" >> ${PEERCONF}
+ fi
fi
- echo "connect \"/usr/sbin/chat $chatreadenv -f ${CHATSCRIPT} -r ${REPORTFILE} ${chatdbg}\"" >> ${PEERCONF}
- fi
+ opts="$opts call ${DEVNAME}"
fi
-
- opts="$opts call ${DEVNAME}"
- fi
fi
if [ -z "$HOLDOFF" ]; then
- HOLDOFF=30
+ HOLDOFF=30
fi
if is_yes "${PERSIST}"; then
- if [ -z "${MAXFAIL}" ]; then
- MAXFAIL="0"
- fi
- opts="$opts persist holdoff $HOLDOFF maxfail $MAXFAIL"
+ if [ -z "${MAXFAIL}" ]; then
+ MAXFAIL="0"
+ fi
+ opts="$opts persist holdoff $HOLDOFF maxfail $MAXFAIL"
fi
if is_yes "${DEMAND}"; then
- if [ -z "${IDLE}" ]; then
- IDLE="0"
- fi
- opts="$opts demand ktune idle ${IDLE}"
+ if [ -z "${IDLE}" ]; then
+ IDLE="0"
+ fi
+ opts="$opts demand ktune idle ${IDLE}"
fi
if ! is_no "${HARDFLOWCTL}"; then
- opts="$opts crtscts"
+ opts="$opts crtscts"
fi
if is_yes "${MODEMCTL}"; then
- opts="$opts modem"
+ opts="$opts modem"
fi
if is_yes "${ESCAPECHARS}"; then
- opts="$opts asyncmap FFFFFFFF"
+ opts="$opts asyncmap FFFFFFFF"
else
- opts="$opts asyncmap 00000000"
+ opts="$opts asyncmap 00000000"
fi
if is_yes "${DEFROUTE}"; then
- # pppd will no longer delete an existing default route
- # so we have to help it out a little here.
- ip route del 0/0 > /dev/null 2>&1
- opts="$opts defaultroute"
+ # pppd will no longer delete an existing default route
+ # so we have to help it out a little here.
+ ip route del 0/0 > /dev/null 2>&1
+ opts="$opts defaultroute"
elif ! is_no "${DEFROUTE}"; then
- opts="$opts defaultroute"
+ opts="$opts defaultroute"
fi
if ! is_no "${PEERDNS}"; then
- opts="$opts usepeerdns"
+ opts="$opts usepeerdns"
fi
if [ -n "${MRU}" ] ; then
- opts="$opts mru ${MRU}"
+ opts="$opts mru ${MRU}"
fi
if [ -n "${MTU}" ] ; then
- opts="$opts mtu ${MTU}"
+ opts="$opts mtu ${MTU}"
fi
if is_yes "$IPV4_NETWORKING" && [ -n "${IP4ADDR}${REMIP}" ] ; then
- # if either IP address is set, the following will work.
- opts="$opts ${IP4ADDR}:${REMIP}"
+ # if either IP address is set, the following will work.
+ opts="$opts ${IP4ADDR}:${REMIP}"
fi
if is_yes "$IPV6_NETWORKING"; then
- if is_yes "$IPV6_PPP"; then
- if [ -n "${IP6ADDR}${REMIP6}" ] ; then
- opts="$opts ipv6 ${IP6ADDR},${REMIP6}"
- elif is_yes "$IPV6_CP_USEV4"; then
- opts="$opts ipv6cp-use-ipaddr"
- elif is_yes "$IPV6_CP_PERSISTENT"; then
- opts="$opts ipv6cp-use-persistent"
+ if is_yes "$IPV6_PPP"; then
+ if [ -n "${IP6ADDR}${REMIP6}" ] ; then
+ opts="$opts ipv6 ${IP6ADDR},${REMIP6}"
+ elif is_yes "$IPV6_CP_USEV4"; then
+ opts="$opts ipv6cp-use-ipaddr"
+ elif is_yes "$IPV6_CP_PERSISTENT"; then
+ opts="$opts ipv6cp-use-persistent"
+ fi
+ elif is_no "$IPV6_PPP"; then
+ opts="$opts noipv6"
fi
- elif is_no "$IPV6_PPP"; then
- opts="$opts noipv6"
- fi
elif is_no "$IPV6_NETWORKING"; then
- opts="$opts noipv6"
+ opts="$opts noipv6"
fi
if is_yes "${IPX_PPP}"; then
- opts="$opts ipx"
- if [ -n "${IPX_PPP_NETWORK}" ]; then
- opts="$opts ipx-network ${IPX_PPP_NETWORK}"
- fi
- if [ -n "${IPX_PPP_NODE}" ]; then
- opts="$opts ipx-node ${IPX_PPP_NODE}"
- fi
- if [ -n "${IPX_PPP_ROUTING}" ]; then
- opts="$opts ipx-routing ${IPX_PPP_ROUTING}"
- fi
+ opts="$opts ipx"
+ if [ -n "${IPX_PPP_NETWORK}" ]; then
+ opts="$opts ipx-network ${IPX_PPP_NETWORK}"
+ fi
+ if [ -n "${IPX_PPP_NODE}" ]; then
+ opts="$opts ipx-node ${IPX_PPP_NODE}"
+ fi
+ if [ -n "${IPX_PPP_ROUTING}" ]; then
+ opts="$opts ipx-routing ${IPX_PPP_ROUTING}"
+ fi
fi
if [ -n "${PAPNAME}" ] ; then
- opts="$opts user ${PAPNAME}"
+ opts="$opts user ${PAPNAME}"
fi
if [ -n "${REMOTENAME}" ] ; then
- opts="$opts remotename ${REMOTENAME}"
+ opts="$opts remotename ${REMOTENAME}"
fi
if is_yes "${DEBUG}"; then
- opts="$opts debug"
+ opts="$opts debug"
fi
if is_yes "${AUTH}"; then
- opts="$opts auth"
+ opts="$opts auth"
elif is_no "${AUTH}"; then
- opts="$opts noauth"
+ opts="$opts noauth"
fi
if is_yes "$PLUGIN_IFCFG_PASSWORD" && [ -n "$PASSWORD" ]; then
- if [ -f "$CONFIG" ]; then
- ifcfg_password_config="$CONFIG"
- else
- ifcfg_password_config="/etc/sysconfig/interfaces/$CONFIG"
- fi
- opts="$opts plugin ifcfg-password.so ifcfg $ifcfg_password_config"
+ if [ -f "$CONFIG" ]; then
+ ifcfg_password_config="$CONFIG"
+ else
+ ifcfg_password_config="/etc/sysconfig/interfaces/$CONFIG"
+ fi
+ opts="$opts plugin ifcfg-password.so ifcfg $ifcfg_password_config"
fi
if ! is_no "${UNIT}"; then
- UNIT=$(echo "${DEVICE}" | awk ' { gsub(/ppp/,NUL); print $0} ')
- opts="$opts unit ${UNIT}"
+ UNIT=$(echo "${DEVICE}" | awk ' { gsub(/ppp/,NUL); print $0} ')
+ opts="$opts unit ${UNIT}"
fi
MODEM="${MODEMPORT}"; export MODEM
(logger -p daemon.info -t ifup-ppp \
- "$(nls 'pppd started for %s on device %s at speed %s' "$DEVICE" \
+ "$(nls 'pppd started for %s on device %s at speed %s' "$DEVICE" \
"$MODEMPORT" "${LINESPEED:-(unspecified)} on unit ${UNIT}")" &)&
if [ -n "${DATAFORCHAT}" ]; then
- export $DATAFORCHAT
+ export $DATAFORCHAT
fi
/usr/sbin/pppd $opts ${MODEMMODE} "${MODEMPORT}" ${LINESPEED} \
- ipparam ${DEVNAME} linkname ${DEVNAME} \
- ${PPPOPTIONS}
-
+ ipparam ${DEVNAME} linkname ${DEVNAME} \
+ ${PPPOPTIONS}
+
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-routes
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-routes (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-routes Wed Oct 26 18:33:29 2005
@@ -11,20 +11,20 @@
DEV=$1
if [ -z "$DEV" ]; then
- nls "Usage: %s <device name>" "ifup-routes" >&2
- exit 1
+ nls "Usage: %s <device name>" "ifup-routes" >&2
+ exit 1
fi
if [ ! -f /etc/sysconfig/static-routes ]; then
- exit 0
+ exit 0
fi
if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
- CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
+ CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
else
- CONFIG="$DEV"
+ CONFIG="$DEV"
fi
-
+
source_config
# set all major variables
@@ -34,18 +34,17 @@
# note the trailing white space character in the grep gets rid of aliases
egrep "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
- if (echo $args | grep -q ":") then
- if is_no "$IPV6_NETWORKING"; then
- continue
- fi
- else
- if is_no "$IPV4_NETWORKING"; then
- continue
+ if (echo $args | grep -q ":") then
+ if is_no "$IPV6_NETWORKING"; then
+ continue
+ fi
+ else
+ if is_no "$IPV4_NETWORKING"; then
+ continue
+ fi
fi
- fi
- /sbin/ip route add $args dev $REALDEVICE
+ /sbin/ip route add $args dev $REALDEVICE
done
-
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-sl
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-sl (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-sl Wed Oct 26 18:33:29 2005
@@ -12,10 +12,10 @@
# become a daemon in case we have to persist.
if [ "$1" != daemon ] ; then
- # disconnect stdin, out, err to disassociate from controlling tty
- # so that no HUPs will get through.
- $0 daemon $*& </dev/null >/dev/null 2>/dev/null
- exit 0
+ # disconnect stdin, out, err to disassociate from controlling tty
+ # so that no HUPs will get through.
+ $0 daemon $*& </dev/null >/dev/null 2>/dev/null
+ exit 0
fi
shift
@@ -23,103 +23,98 @@
source_config
if [ "foo$2" = "fooboot" ] && is_no ${ONBOOT}; then
- exit
+ exit
fi
# set all major variables
setup_ip_param
if [ -z "$RETRYTIMEOUT" ]; then
- RETRYTIMEOUT=30
+ RETRYTIMEOUT=30
fi
# Try to load slip module
if is_module "slip"; then
- /sbin/modprobe -s -k slip
+ /sbin/modprobe -s -k slip
fi
# we can use dip or direct slip connection via slattach
if is_no "$DIRECT_CONNECT"; then
+ [ -x /usr/sbin/dip ] || {
+ nls "%s does not exist or is not executable" "/usr/sbin/dip"
+ nls "%s for %s exiting" "ifup-sl" "$DEVICE"
+ logger -p daemon.info -t ifup-sl \
+ "$(nls '%s does not exist or is not executable for %s' "/usr/sbin/dip" "$DEVICE")"
+ exit 1
+ }
+
+ DIPSCRIPT=/etc/sysconfig/interfaces/data/dip-$DEVNAME
+ [ -f $DIPSCRIPT ] || {
+ DIPSCRIPT=/etc/sysconfig/interfaces/data/dip-$PARENTDEVNAME
+ }
+ [ -f $DIPSCRIPT ] || {
+ nls '%s does not exist' "/etc/sysconfig/interfaces/data/dip-$DEVICE"
+ nls 'ifup-sl - %s exiting' "$DEVICE"
+ logger -p daemon.info -t ifup-sl \
+ "$(nls '%s does not exist for %s' "/etc/sysconfig/interfaces/data/dip-$DEVICE" "$DEVICE")"
+ exit 1
+ }
- [ -x /usr/sbin/dip ] || {
- nls "%s does not exist or is not executable" "/usr/sbin/dip"
- nls "%s for %s exiting" "ifup-sl" "$DEVICE"
- logger -p daemon.info -t ifup-sl \
- "$(nls '%s does not exist or is not executable for %s' "/usr/sbin/dip" "$DEVICE")"
- exit 1
- }
-
- DIPSCRIPT=/etc/sysconfig/interfaces/data/dip-$DEVNAME
- [ -f $DIPSCRIPT ] || {
- DIPSCRIPT=/etc/sysconfig/interfaces/data/dip-$PARENTDEVNAME
- }
- [ -f $DIPSCRIPT ] || {
- nls '%s does not exist' "/etc/sysconfig/interfaces/data/dip-$DEVICE"
- nls 'ifup-sl - %s exiting' "$DEVICE"
- logger -p daemon.info -t ifup-sl \
- "$(nls '%s does not exist for %s' "/etc/sysconfig/interfaces/data/dip-$DEVICE" "$DEVICE")"
- exit 1
- }
+ while : ; do
+ echo > /var/run/sl-$DEVICE.dev
+ (logger -p daemon.info -t ifup-sl \
+ "$(nls 'dip started for %s on %s at %s' "$DEVICE" "$MODEMPORT" "$LINESPEED")" &)&
+ doexec /usr/sbin/dip dip-$DEVICE $DIPSCRIPT
+ if is_no "$PERSIST" || [ ! -f /var/run/sl-$DEVICE.dev ] ; then
+ exit 0
+ fi
+ rm -f /var/run/sl-$DEVICE.dev
+
+ sleep $RETRYTIMEOUT || {
+ # sleep was killed
+ exit 0
+ }
+ done
+else
+ # direct connection via slattach
+ [ -z "$MTU" ] && MTU=1500
+ [ -z "$PROTOCOL" ] && PROTOCOL=slip
+
+ [ -x /sbin/slattach ] || {
+ nls "%s is missing. Can't continue." "/sbin/slattach"
+ nls "ifup-sl - %s exiting" "$DEVICE"
+ logger -p daemon.info -t ifup-sl \
+ "$(nls '%s does not exist or is not executable for %s' "/sbin/slattach" "$DEVICE")"
+ exit 1
+ }
- while : ; do
echo > /var/run/sl-$DEVICE.dev
(logger -p daemon.info -t ifup-sl \
- "$(nls 'dip started for %s on %s at %s' "$DEVICE" "$MODEMPORT" "$LINESPEED")" &)&
- doexec /usr/sbin/dip dip-$DEVICE $DIPSCRIPT
- if is_no "$PERSIST" || [ ! -f /var/run/sl-$DEVICE.dev ] ; then
- exit 0
- fi
- rm -f /var/run/sl-$DEVICE.dev
-
- sleep $RETRYTIMEOUT || {
- # sleep was killed
- exit 0
- }
- done
+ "$(nls 'slattach started for %s on %s at %s' "$DEVICE" "$MODEMPORT" "$LINESPEED")" &)&
-else
+ slattach -p $PROTOCOL -s $LINESPEED $MODEMPORT &
+ usleep 1500
- # direct connection via slattach
- [ -z "$MTU" ] && MTU=1500
- [ -z "$PROTOCOL" ] && PROTOCOL=slip
-
- [ -x /sbin/slattach ] || {
- nls "%s is missing. Can't continue." "/sbin/slattach"
- nls "ifup-sl - %s exiting" "$DEVICE"
- logger -p daemon.info -t ifup-sl \
- "$(nls '%s does not exist or is not executable for %s' "/sbin/slattach" "$DEVICE")"
- exit 1
- }
-
- echo > /var/run/sl-$DEVICE.dev
- (logger -p daemon.info -t ifup-sl \
- "$(nls 'slattach started for %s on %s at %s' "$DEVICE" "$MODEMPORT" "$LINESPEED")" &)&
-
- slattach -p $PROTOCOL -s $LINESPEED $MODEMPORT &
- usleep 1500
-
- if is_yes "$IPV4_NETWORKING"; then
- if [ -n "$IP4ADDR" -a -n "$REMIP" ]; then
- # Peer is only for IPv4
- ip -4 addr add $IP4ADDR peer $REMIP dev $DEVICE
+ if is_yes "$IPV4_NETWORKING"; then
+ if [ -n "$IP4ADDR" -a -n "$REMIP" ]; then
+ # Peer is only for IPv4
+ ip -4 addr add $IP4ADDR peer $REMIP dev $DEVICE
+ fi
fi
- fi
- if is_yes "$IPV6_NETWORKING"; then
- if [ -n "$IP6ADDR" ]; then
- ip -6 addr add $IP6ADDR dev $DEVICE
- fi
- fi
-
- ip link set $DEVICE mtu $MTU up
+ if is_yes "$IPV6_NETWORKING"; then
+ if [ -n "$IP6ADDR" ]; then
+ ip -6 addr add $IP6ADDR dev $DEVICE
+ fi
+ fi
- # IPv4/6 gateways and default routes
- setup_ip_gw_ro
+ ip link set $DEVICE mtu $MTU up
- /etc/sysconfig/network-scripts/ifup-post $1
+ # IPv4/6 gateways and default routes
+ setup_ip_gw_ro
+ /etc/sysconfig/network-scripts/ifup-post $1
fi
-
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-vlan Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# ifup-vlan - Virtual LAN configuration script
-# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 2001 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,35 +30,35 @@
source_config
if is_no "${VLAN_NETWORKING}"; then
- exit 0
+ exit 0
fi
if [ "foo$2" = "fooboot" ] && is_no "${ONBOOT}"; then
- exit 0
+ exit 0
fi
VLAN_DEV=$(echo ${DEVICE} | awk ' { gsub(/\..*$/,NUL); print $0 } ')
VLAN_ID=$(echo ${DEVICE} | awk " { gsub(/${VLAN_DEV}\./,NUL); print \$0 } ")
if [ ! -f /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV} ]; then
- nls "%s is missing. Can't continue." "ifcfg-${VLAN_DEV}"
- exit 1
+ nls "%s is missing. Can't continue." "ifcfg-${VLAN_DEV}"
+ exit 1
fi
if ! egrep -ql "ONBOOT=[^n][^o]" /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV}; then
- # XXX: maybe display some message? Right now disabling VLAN_DEV means disabling
- # VLANs, too. --misiek
- exit 1
+ # XXX: maybe display some message? Right now disabling VLAN_DEV means disabling
+ # VLANs, too. --misiek
+ exit 1
fi
if [ ! -x /sbin/vconfig ]; then
- nls "%s is missing. Can't continue." "/sbin/vconfig"
- exit 1
+ nls "%s is missing. Can't continue." "/sbin/vconfig"
+ exit 1
fi
if [ ! -e /proc/net/vlan/config ]; then
- nls "VLAN kernel support is missing. Can't continue."
- exit 1
+ nls "VLAN kernel support is missing. Can't continue."
+ exit 1
fi
# set all major variables
@@ -75,4 +75,4 @@
exit $RESULT
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/tnldown
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/tnldown (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/tnldown Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# tnldown - tunnel configuration script
-# Copyright (C) 1999, 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 1999, 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
DEV=$1
[ -z "$DEV" ] && {
- nls "Usage: %s <device name>" "tnldown" >&2
- exit 1
+ nls "Usage: %s <device name>" "tnldown" >&2
+ exit 1
}
TNLCONFIGS=$(ls /etc/sysconfig/interfaces/tnlcfg-* 2>/dev/null | egrep -v '~$')
@@ -36,31 +36,31 @@
CONFIG=$(egrep -l "^DEVICE=[\"\']*$DEV[\"\']*\$" $TNLCONFIGS)
if [ -z "$CONFIG" ]; then
- CONFIG="$DEV"
+ CONFIG="$DEV"
fi
if false; then
-[ -f "/etc/sysconfig/interfaces/$CONFIG" ] || CONFIG=tnlcfg-$CONFIG
-[ -f "/etc/sysconfig/interfaces/$CONFIG" ] || {
- echo "usage: tnldown <device name>" >&2
- exit 1
-}
+ [ -f "/etc/sysconfig/interfaces/$CONFIG" ] || CONFIG=tnlcfg-$CONFIG
+ [ -f "/etc/sysconfig/interfaces/$CONFIG" ] || {
+ echo "usage: tnldown <device name>" >&2
+ exit 1
+ }
fi
source_config
case "${MODE}" in
- sit|four)
+ sit|four)
is_no "${IPV6_NETWORKING}" && exit 0
is_no "${IPV6_TUNNELCONFIG}" && exit 0
;;
- ipip)
+ ipip)
is_no "${IPV4_NETWORKING}" && exit 0
;;
- gre)
+ gre)
is_no "${IPV4_NETWORKING}" && exit 0
;;
- ipxip|ipipx)
+ ipxip|ipipx)
is_no "${IPX}" && exit 0
;;
esac
@@ -68,21 +68,21 @@
RESULT=0
case "${MODE}" in
- ipip|sit|gre)
+ ipip|sit|gre)
ip link set ${DEVICE} down
ip tunnel del ${DEVICE}
RESULT=$?
;;
- four)
+ four)
ip link set ${DEVICE} down
fourcfg del ${DEVICE}
RESULT=$?
;;
- ipxip|ipipx)
+ ipxip|ipipx)
;;
esac
exit $RESULT
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/network-scripts/tnlup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/tnlup (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/tnlup Wed Oct 26 18:33:29 2005
@@ -1,7 +1,7 @@
#!/bin/sh
#
# tnlup - tunnel configuration script
-# Copyright (C) 1999, 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
+# Copyright (C) 1999, 2000 Arkadiusz Miśkiewicz <misiek at pld-linux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
DEV=$1
[ -z "$DEV" ] && {
- nls "Usage: %s <device name>" "tnlup" >&2
- exit 1
+ nls "Usage: %s <device name>" "tnlup" >&2
+ exit 1
}
TNLCONFIGS=$(ls /etc/sysconfig/interfaces/tnlcfg-* 2>/dev/null | egrep -v '~$')
@@ -36,38 +36,38 @@
CONFIG=$(egrep -l "^DEVICE=[\"\']*$DEV[\"\']*\$" $TNLCONFIGS)
if [ -z "$CONFIG" ]; then
- CONFIG="$DEV"
+ CONFIG="$DEV"
fi
if false; then
-[ -f "/etc/sysconfig/interfaces/$CONFIG" ] || CONFIG=tnlcfg-$CONFIG
-[ -f "/etc/sysconfig/interfaces/$CONFIG" ] || {
- echo "usage: tnlup <device name>" >&2
- exit 1
-}
+ [ -f "/etc/sysconfig/interfaces/$CONFIG" ] || CONFIG=tnlcfg-$CONFIG
+ [ -f "/etc/sysconfig/interfaces/$CONFIG" ] || {
+ echo "usage: tnlup <device name>" >&2
+ exit 1
+ }
fi
source_config
if [ "foo$2" = "fooboot" -a -n "${ONBOOT}" ] && is_no "${ONBOOT}"; then
- exit
+ exit
fi
case "${MODE}" in
- sit|four)
+ sit|four)
is_no "${IPV6_NETWORKING}" && exit 0
is_no "${IPV6_TUNNELCONFIG}" && exit 0
[ "${MODE}" = "four" ] && is_module "fourtun" && modprobe -s -k fourtun
;;
- ipip)
+ ipip)
is_no "${IPV4_NETWORKING}" && exit 0
is_module "ipip" && modprobe -s -k ipip
;;
- gre)
+ gre)
is_no "${IPV4_NETWORKING}" && exit 0
is_module "ip_gre" && modprobe -s -k ip_gre
;;
- ipxip|ipipx)
+ ipxip|ipipx)
is_no "${IPX}" && exit 0
;;
esac
@@ -83,17 +83,17 @@
[ -n "${ENCAPLIMIT}" ] && ENCAPLIMIT="encaplimit ${ENCAPLIMIT}"
if is_yes "${SEQ}"; then
- SEQ=seq
+ SEQ=seq
else
- is_yes "${ISEQ}" && SEQ=iseq
- is_yes "${OSEQ}" && SEQ="${SEQ} oseq"
+ is_yes "${ISEQ}" && SEQ=iseq
+ is_yes "${OSEQ}" && SEQ="${SEQ} oseq"
fi
if is_yes "${CSUM}"; then
- CSUM=csum
+ CSUM=csum
else
- is_yes "${ICSUM}" && CSUM=icsum
- is_yes "${ICSUM}" && CSUM="${SEQ} ocsum"
+ is_yes "${ICSUM}" && CSUM=icsum
+ is_yes "${ICSUM}" && CSUM="${SEQ} ocsum"
fi
is_yes "${ISEQ}" && ISEQ=iseq
@@ -101,38 +101,38 @@
[ -z "${PMTUDISC}" -a "${TTL}" != "0" -a "${TTL}" != "inherit" ] && PMTUDISC=yes
if is_yes "${PMTUDISC}"; then
- PMTUDISC=pmtudisc
+ PMTUDISC=pmtudisc
elif is_no "${PMTUDISC}"; then
- PMTUDISC=nopmtudisc
+ PMTUDISC=nopmtudisc
fi
if [ -n "${KEY}" ]; then
- IKEY=""
- OKEY=""
+ IKEY=""
+ OKEY=""
fi
case "${MODE}" in
- ipip|sit)
+ ipip|sit)
ip tunnel add ${DEVICE} mode ${MODE} local ${LOCALADDR} \
- remote ${REMOTEADDR} ${TTL} ${TOS} ${PMTUDISC} ${BIND_DEV}
+ remote ${REMOTEADDR} ${TTL} ${TOS} ${PMTUDISC} ${BIND_DEV}
RESULT=$?
;;
- gre)
+ gre)
ip tunnel add ${DEVICE} mode ${MODE} local ${LOCALADDR} \
- remote ${REMOTEADDR} ${TTL} ${TOS} ${PMTUDISC} ${BIND_DEV} \
- ${CSUM} ${ISEQ} ${KEY} ${IKEY} ${OKEY}
+ remote ${REMOTEADDR} ${TTL} ${TOS} ${PMTUDISC} ${BIND_DEV} \
+ ${CSUM} ${ISEQ} ${KEY} ${IKEY} ${OKEY}
RESULT=$?
;;
- fourtun)
+ fourtun)
fourcfg add ${DEVICE} saddr ${LOCALADDR} daddr ${REMOTEADDR} \
- ${PRIORITY} ${HOPLIMIT} ${ENCAPLIMIT}
+ ${PRIORITY} ${HOPLIMIT} ${ENCAPLIMIT}
RESULT=$?
;;
- ipxip|ipipx)
+ ipxip|ipipx)
;;
esac
exit $RESULT
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/static-nat
==============================================================================
--- rc-scripts/trunk/sysconfig/static-nat (original)
+++ rc-scripts/trunk/sysconfig/static-nat Wed Oct 26 18:33:29 2005
@@ -1 +1,3 @@
-# <IP>[/<mask>] via <IP> # 192.168.1.1 via 1.1.1.1 # 192.168.2.1/24 via 1.1.1.1
+# <IP>[/<mask>] via <IP>
+# 192.168.1.1 via 1.1.1.1
+# 192.168.2.1/24 via 1.1.1.1
Modified: rc-scripts/trunk/sysconfig/static-routes
==============================================================================
--- rc-scripts/trunk/sysconfig/static-routes (original)
+++ rc-scripts/trunk/sysconfig/static-routes Wed Oct 26 18:33:29 2005
@@ -7,4 +7,3 @@
#from 192.168.2.0/24 table 10
#eth0 default via 192.168.2.1 table 10
-
Modified: rc-scripts/trunk/sysconfig/system
==============================================================================
--- rc-scripts/trunk/sysconfig/system (original)
+++ rc-scripts/trunk/sysconfig/system Wed Oct 26 18:33:29 2005
@@ -99,4 +99,4 @@
RC_LOGGING=yes
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
Modified: rc-scripts/trunk/sysconfig/timezone
==============================================================================
--- rc-scripts/trunk/sysconfig/timezone (original)
+++ rc-scripts/trunk/sysconfig/timezone Wed Oct 26 18:33:29 2005
@@ -1,20 +1,20 @@
# Time zone information.
#
-# Directory containing
+# Directory containing
# zone information files.
ZONE_INFO_DIR="/usr/share/zoneinfo"
-# Scheme you would like
+# Scheme you would like
# to use in your system.
ZONE_INFO_SCHEME="posix"
# Area (sometimes may be empty)
ZONE_INFO_AREA="Europe"
-# Name of the time zone
+# Name of the time zone
# for your system.
TIME_ZONE="Warsaw"
# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
+# vi:syntax=sh
More information about the pld-cvs-commit
mailing list