]> git.pld-linux.org Git - projects/rc-scripts.git/commitdiff
- replaced sed with awk (backport from TOTALNEW branch)
authorJan Rękorajski <baggins@pld-linux.org>
Thu, 16 Nov 2000 15:58:55 +0000 (15:58 +0000)
committerJan Rękorajski <baggins@pld-linux.org>
Thu, 16 Nov 2000 15:58:55 +0000 (15:58 +0000)
svn-id: @832

po/Makefile.am
rc.d/init.d/functions.network
rc.d/init.d/network
rc.d/rc.sysinit
sysconfig/network-scripts/ifdown
sysconfig/network-scripts/ifdown-post
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-post

index 3e8f6601b731ffb982226e70514970266aa45bda..f1fd4a068c50a6c96bb2d1109d53b63f64f610e4 100644 (file)
@@ -16,7 +16,7 @@ SUFFIXES = .po .mo .gmo
        $(MSGFMT) -o $@ $<
 
 .po.gmo: $(PACKAGE).pot
-       file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+       file=$(srcdir)/`echo $* | awk ' { gsub(/.*\//,NIL); print $0; } '`.gmo \
          && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 $(PACKAGE).pot: Makefile $(POTSRC)
@@ -32,7 +32,7 @@ update-po: Makefile
        catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+         lang=`echo $$cat | awk ' { gsub(/\$(CATOBJEXT)$$/,NIL); print $0; } '`; \
          mv $$lang.po $$lang.old.po; \
          echo "$$lang:"; \
          if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
@@ -59,7 +59,7 @@ install-data-hook: all
            *.gmo) destdir=$(gnulocaledir);; \
            *)     destdir=$(localedir);; \
          esac; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+         lang=`echo $$cat | awk ' { gsub(/\$(CATOBJEXT)$$/,NIL); print $0; } '`; \
          dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
          if test -r "$(MKINSTALLDIRS)"; then \
            $(MKINSTALLDIRS) $$dir; \
@@ -96,7 +96,7 @@ uninstall-hook:
        catalogs='$(CATALOGS)'; \
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+         lang=`echo $$cat | awk ' { gsub(/\$(CATOBJEXT)$$/,NIL); print $0; } '`; \
          rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
          rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
          rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
index 10d73188056a7665b77f3ac5d224cb0d41caf860..d4534448743e3a5e2eec4d502b51bf36562f0ad8 100755 (executable)
@@ -1,5 +1,5 @@
 #
-# $Id: functions.network,v 1.45.2.1 2000/10/18 20:10:50 misiek Exp $
+# $Id: functions.network,v 1.46 2000/11/16 15:58:54 baggins Exp $
 # 
 # This is not a shell script; it provides functions to network scripts
 # that source it.
@@ -7,9 +7,7 @@
 # This will work only after starting interface to which LDAP server is connected
 find_ldap_interfaces()
 {
-local BSWITH QUERY
-is_no "$USE_LDAP" && return 0
-
+is_yes "$USE_LDAP" && [ -x /usr/bin/ldapsearch ] || exit 1
 if [ -n "$LDAP_BASE_DN" ] ; then
        BSWITCH="-b$LDAP_BASE_DN" 
 else
@@ -24,9 +22,7 @@ ldapsearch "$BSWITCH" "$QUERY" if_device | \
 # find aliases for device
 find_ldap_aliases()
 {
-local BSWITH QUERY
-is_no "$USE_LDAP" && return 0
-
+is_yes "$USE_LDAP" && [ -x /usr/bin/ldapsearch ] || exit 1
 if [ -n "$LDAP_BASE_DN" ] ; then
        BSWITCH="-b$LDAP_BASE_DN" 
 else
@@ -40,8 +36,9 @@ ldapsearch "$BSWITCH" "$QUERY" if_device | \
 
 get_ldap_config ()
 {
-local local BSWITH QUERY IPV6_ADDR IPADDR_ALIASES FIELD VALUE VAR
-is_no "$USE_LDAP" && return 0
+if is_yes "$USE_LDAP" && [ -x /usr/bin/ldapsearch ]; then
+       exit 1
+fi
 
 # Initialise fields which  can have multiple values:
 IPV6_ADDR=""
@@ -137,13 +134,14 @@ if [ -n "$domain" ] ; then
 fi
 }
 
-# PLD GNU/Linux network functions
+# PLD/Linux network functions
 # Copyright (C) 1999, 2000 Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
 
+# All functions must be called "name_of_function on" or "name_of_function off"
+
 # Setup Network Address Translation (NAT)
 setup_nat()
 {
-local src via dst
 if [ -r /etc/sysconfig/static-nat ]; then
        grep "^[0-9]" /etc/sysconfig/static-nat | while read src via dst; do
                if [ "$1" = "on" ]; then
@@ -157,220 +155,155 @@ if [ -r /etc/sysconfig/static-nat ]; then
 fi
 }
 
-# Setup static ARP
-static_arp()
+# network router discovery daemon
+rdisc()
 {
-local 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
+if is_yes "$IPV6_NETWORKING"; then
+  [ -z "$IPV6_RDISC_MODE" ] && IPV6_RDISC_MODE=host
+  if is_yes "$IPV6_RDISC"; then
+  RDISC_OPTS="-fs"
+       case "$1" in
+       on|start)
+               [ "$IPV6_RDISC_MODE" = "router" ] && \
+               RDISC_OPTS="$RDISC_OPTS -r"
+               run_cmd "Starting network router discovery daemon" \
+                       /usr/sbin/rdisc $RDISC_OPTS
+               ;;
+       off|stop)
+               msg_stopping "network router discovery daemon"
+               killproc rdisc -HUP
+               ;;
+       esac
+  fi
 fi
 }
 
-setup_forwarding ()
-{
-if is_yes "$IPV4_NETWORKING" && is_yes "$IPV4_FORWARDING" && [ -f /proc/sys/net/ipv4/ip_forward ];
-then
-       if [ "$1" = "on" ]; then
-               run_cmd "Enabling IPv4 packed forwarding" sysctl -w net.ipv4.ip_forward=1
-       else
-               run_cmd "Disabling IPv4 packed forwarding" sysctl -w net.ipv4.ip_forward=0
-       fi
-fi
+# proc_net <zmien> <start/stop> <co ustaw> <co default> <nazwa_zmiennej> [komunikat]
+# proc_net ipv4/ip_forward start 1         0            IPV4_FORWARDING  "IPv4 forwarding"
+#
+# wy¶wietli siê komunikat "Setting IPv4 forwarding to 1"
+# je¶li nie podano komunikatu nic nie jest wy¶wietlane
 
-if is_yes "$IPV6_NETWORKING" && is_yes "$IPV6_FORWARDING" && [ -f /proc/sys/net/ipv6/conf/all/forwarding ];
-then
-       if [ "$1" = "on" ]; then
-               run_cmd "Enabling IPv6 packed forwarding" sysctl -w net.ipv6.conf.all.forwarding=1
-       else
-               run_cmd "Disabling IPv6 packed forwarding" sysctl -w net.ipv6.conf.all.forwarding=0
+proc_net()
+{
+WHAT="$1"
+TODO="$2"
+SET="$3"
+DEF="$4"
+VAR="$5"
+MESSAGE="$6"
+eval VARD=\$${VAR}
+
+if [ -n "$VARD" -a -e /proc/sys/net/$WHAT ]; then
+       if [ "$TODO" = "start" ]; then
+               is_no "$VARD" && [ "$SET" = "1" ] && SET="$(($SET - 1))"
+               is_yes "$VARD" && [ "$SET" = "0" ] && SET="$(($SET + 1))"
+               if [ -n "$MESSAGE" ]; then
+                       show "`nls "Setting %s to %s" "$MESSAGE" "$SET"`"; busy
+                       if (echo "$SET" > /proc/sys/net/$WHAT) 2> /dev/null; then
+                               deltext; ok
+                       else
+                               deltext; fail
+                       fi
+               else
+                       echo "$SET" > /proc/sys/net/$WHAT
+               fi
+       elif [ "$TODO" = "stop" ]; then
+               if [ -n "$MESSAGE" ]; then
+                       show "`nls "Setting %s to %s" "$MESSAGE" "$DEF"`"; busy
+                       if (echo "$DEF" > /proc/sys/net/$WHAT) 2> /dev/null; then
+                               deltext; ok
+                       else
+                               deltext; fail
+                       fi
+               fi
        fi
 fi
+return 0
 }
 
-# Set up all IP && IP parameter variables
-setup_ip_param ()
+ipv4_dynamic_ip_patch()
 {
-# detect network device type (ie. dummy, eth for dummy0, eth0 ..)
-DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*$/,NUL); print $0 } ')
-# real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
-DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
-
-eval IP4ADDR="\$IP_${IP4_PRIM_NR:-1}_ADDR"
-eval IP4ADDROPT="\$IP_${IP4_PRIM_NR:-1}_AOPTS"
-eval IP4ROUTEOPT="\$IP_${IP4_PRIM_NR:-1}_ROPTS"
-eval IP6ADDR="\$IP_${IP6_PRIM_NR:-1}_ADDR"
-eval IP6ADDROPT="\$IP_${IP6_PRIM_NR:-1}_AOPTS"
-eval IP6ADDROPT="\$IP_${IP6_PRIM_NR:-1}_AOPTS"
-eval IP4SRCADDR="\$IP_${IP4_SRC_NR}_ADDR"
-[ -n "$IP4SRCADDR" ] && IP4SRCADDR="src $IP4SRCADDR"
-eval IP6SRCADDR="\$IP_${IP6_SRC_NR}_ADDR"
-[ -n "$IP6SRCADDR" ] && IP6SRCADDR="src $IP4SRCADDR"
-
-# If tunnel device then add onlink option in routing
-[ -n "$MODE" ] && TNLOPTS="onlink"
-
-# new rc-scripts 0.4.x option
-if [ -z "$HANDLING" ]; then
-       typeset -i HANDLING=0
-fi
-
-# set handling for bridge
-case "$DEVICETYPE" in
-       br|atm|lec)
-               HANDLING=1
-               ;;
-esac
-               
-# Multicast ready devices
-if is_yes "$MULTICAST"; then
-       MULTICAST="on"
-else
-       case "$DEVICETYPE" in
-               eth|br)
-                       MULTICAST="on"
-                       ;;
-               *)
-                       MULTICAST="off"
-                       ;;
+if [ "$IPV4_DYNAMIC_IP_PATCH" != "default" -a -n "$IPV4_DYNAMIC_IP_PATCH" ] ||
+   [ ! -e /proc/sys/net/ipv4/ip_dynaddr ]; then
+       case "$IPV4_DYNAMIC_IP_PATCH_VALUE" in
+               [1-9])  ;;
+               *)      IPV4_DYNAMIC_IP_PATCH_VALUE=7 ;;
        esac
-fi
-
-# ARP ready devices
-if is_yes "$ARP"; then
-       ARP="on"
-else
-       case "$DEVICETYPE" in
-               eth|br|lec|atm)
-                       ARP="on"
-                       ;;
-               *)
-                       ARP="off"
-                       ;;
-       esac
-fi
-                               
-}
 
-check_device_down ()
-{
-       if (ip link show dev ${DEVICE} 2> /dev/null | grep -q UP); then
-               return 1
+       if is_yes "$IPV4_DYNAMIC_IP_PATCH" && [ "$1" = "on" ]; then
+               show "Enabling dynamic IP patch"
+               busy
+               if echo $IPV4_DYNAMIC_IP_PATCH_VALUE > /proc/sys/net/ipv4/ip_dynaddr; then
+                       deltext
+                       ok
+               else
+                       deltext
+                       fail
+               fi
        else
-               return 0
+               show "Disabling dynamic IP patch"
+               busy
+               if echo 0 > /proc/sys/net/ipv4/ip_dynaddr; then
+                       deltext
+                       ok
+               else
+                       deltext
+                       fail
+               fi
        fi
+fi
 }
 
-# Start all needed ATM daemons (if not started yet!)
-atm_daemons_start ()
+ipv4_local_port_range()
 {
-if is_no "$ATM"; then
-       return
-fi
-modprobe -qk atm0
-modprobe -qk lec0
-
-if is_yes "$SIGNALLING" && ! (pidof -s /sbin/astmsigd > /dev/null 2>&1); then
-       msg_starting "ATM signalling"
-       daemon atmsigd -b -c /etc/atm/atmsigd.conf \
-               $(is_yes "$SIGNALLING_DEBUG" && echo "-d")
-fi
-
-if is_yes "$ILMI" && ! (pidof -s /sbin/ilmid > /dev/null 2>&1); then
-       msg_starting "ATM ILMI"
-       if [ -f /etc/atm/ilmi.conf ]; then
-               . /etc/atm/ilmi.conf
-               daemon ilmid -b -l $ILMI_LOGFILE \
-                       $([ -z "$ILMI_QOS" ] || echo "-q $ILMI_QOS ") \
-                       $([ "$ILMI_DEBUG" = "yes" ] && echo "-d ") \
-                       $([ -z "$ILMI_UNI" ] || echo "-u $ILMI_UNI ") \
-                       $([ -z "$ILMI_LOCAL_IP" ] || echo "-i $ILMI_LOCAL_IP ")
+if [ "$IPV4_LOCAL_PORT_RANGE" != "default" -a -n "$IPV4_LOCAL_PORT_RANGE" ] || \
+   [ ! -e /proc/sys/net/ipv4/ip_local_port_range ]; then
+       if is_yes "$IPV4_LOCAL_PORT_RANGE" && [ "$1" = "on" ]; then
+               show "Setting local port range"; busy
+               if echo "$IPV4_LOCAL_PORT_RANGE" > /proc/sys/net/ipv4/ip_local_port_range; then
+                       deltext
+                       ok
+               else
+                       deltext
+                       fail
+               fi
        else
-               daemon ilmid -b -l syslog
+               show "Setting default local port range"; busy
+               if echo "1024 4999" > /proc/sys/net/ipv4/ip_local_port_range; then
+                       deltext
+                       ok
+               else
+                       deltext
+                       fail
+               fi
        fi
 fi
-
-if is_yes "$CLIP" && ! (pidof -s /sbin/atmarpd > /dev/null 2>&1); then
-       msg_starting "ATM CLIP"
-       daemon atmarpd -b
-fi
-}
-
-atm_daemons_stop ()
-{
-if is_no "$ATM"; then
-       return
-fi
-
-is_yes "$CLIP" && msg_stopping "ATM CLIP" && killproc atmarpd
-is_yes "$SIGNALLING" && msg_stopping "ATM signalling" && killproc atmsigd
-is_yes "$ILMI" && msg_stopping "ATM ILMI" && killproc ilmid
 }
 
-setup_ip_gw_ro () 
+ipv4_anti_spoofing()
 {
-# 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} ${TNLOPTS}
-               DEFGW=${GATEWAY}
-           elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then
-               ip -4 route add default dev ${DEVICE} ${IP4SRCADDR} ${TNLOPTS}
-           fi
-       fi
-fi
-
-# IPv6 gateway && IPv6 globalroute
-if is_yes "$IPV6_NETWORKING"; then
-       if is_no "${IPV6_FORWARDING}" ; 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}
-                       DEFGW6=${GATEWAY6}
-               elif [ "${GATEWAY6DEV}" = "${DEVICE}" ]; then
-                       ip -6 route add default dev ${DEVICE} ${IP6SRCADDR}
-               fi
-           fi
-        else
-            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}
-               elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
-                   ip -6 route add 2000::/3 via dev ${DEVICE} ${IP6SRCADDR}
+if [ "$IPV4_ANTI_SPOOFING" != "default" -a -n "$IPV4_ANTI_SPOOFING" ] || \
+   [ ! -e /proc/sys/net/ipv4/conf/all/rp_filter ]; then
+       if is_yes "$IPV4_ANTI_SPOOFING" && [ "$1" = "on" ]; then
+               show "Setting up IP spoofing protection"; busy
+               if (for f in /proc/sys/net/ipv4/conf/*/rp_filter; do echo 1 > $f; done); then
+                       deltext
+                       ok
+               else
+                       deltext
+                       fail
+               fi
+       else
+               show "Setting down IP spoofing protection"; busy
+               if (for f in /proc/sys/net/ipv4/conf/*/rp_filter; do echo 0 > $f; done); then
+                       deltext
+                       ok
+               else
+                       deltext
+                       fail
                fi
-           fi
-        fi
+       fi
 fi
 }
 
@@ -379,45 +312,50 @@ fi
 # eg. unreachable or blackhole routes
 # (c) 1999 Jacek Konieczny <jajcus@pld.org.pl>
 #
-setup_routes()
-{
-local 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
+setup_routes(){
+
+       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
-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 arp on up
+ip link set dev lo up arp on
+ip addr add 127.0.0.1/8 dev lo
 }
 
 set_down_loopback()
 {
-ip addr flush dev lo 2>&1 | grep -v "Nothing to flush"
+ip addr flush dev lo 2> /dev/null
 ip link set dev lo down
 }
 
-modprobe_net()
+static_arp()
 {
-if is_yes "$IPV6_NETWORKING" && is_module "ipv6"; then
-       _modprobe single -k ipv6
+if is_yes "$STATIC_ARP"; then
+       if [ -r /etc/ethers -a -x /sbin/arp ]; then
+               /sbin/arp -f /etc/ethers
+       fi
 fi
+}
 
-if is_yes "$IPX" && is_module "ipx"; then
-       _modprobe single -k ipx
+modprobe_net()
+{
+if is_yes "$IPV6_NETWORKING" && [ "`ls -R /lib/modules/\`uname -r\`/ 2>/dev/null | grep ipv6.o`" != "" ]; then
+       modprobe -s -k net-pf-10
+       if is_yes "$IPV6_TUNNELCONFIG" && [ "`ls -R /lib/modules/\`uname -r\`/ 2>/dev/null | grep ipip.o`" != "" ]; then
+               modprobe -s -k ipip
+       fi
 fi
 }
 
@@ -425,8 +363,7 @@ fi
 # folowing function calculates network prefix from given network mask
 # (c) 1999 Grzegorz Stanislawski <stangrze@open.net.pl>
 #
-calcprefix()
-{
+calcprefix() {
 local OISF len olen bad prefix
 OISF=$IFS
 IFS="."
@@ -467,8 +404,7 @@ return
 # folowing function calculates network mask from given prefix
 # (c) 1999 Grzegorz Stanislawski <stangrze@open.net.pl>
 #
-calcnetmask()
-{
+calcnetmask() {
 local prefix a MASK
 MASK=""
 if [ "`echo "${1}" | grep "^[0-9]"`" = "" ]; then
@@ -506,17 +442,16 @@ return
 # Retrievies PPPD PID and real interface name from /var/run/ppp-*.pid
 get_ppp_device_and_pid () {
        
-if [ -f "/var/run/ppp-$DEVICE.pid" ] ; then
-       eval `{
-                read PID ; echo "PID='$PID'" 
-                read REALDEVICE ; echo "REALDEVICE=$REALDEVICE"
-             } < "/var/run/ppp-$DEVICE.pid"`
-fi
-if [ -z "$REALDEVICE" ] ; then
-       REALDEVICE=$DEVICE
-fi
+       if [ -f "/var/run/ppp-$DEVICE.pid" ] ; then
+               eval `{
+                        read PID ; echo "PID='$PID'" 
+                        read REALDEVICE ; echo "REALDEVICE=$REALDEVICE"
+                     } < "/var/run/ppp-$DEVICE.pid"`
+       fi
+       if [ -z "$REALDEVICE" ] ; then
+               REALDEVICE=$DEVICE
+       fi
 }
 
 # This must be last line !
 # vi:syntax=sh:tw=78:ts=8:sw=4
-
index 75239555657fa993ce57a44f26b8d08230c4483e..172a73b0f503035611b9d1907576cee0d091de35 100644 (file)
@@ -8,7 +8,7 @@
 #
 # probe:       true
 
-# $Id: network,v 1.39 2000/11/06 16:24:46 baggins Exp $
+# $Id: network,v 1.40 2000/11/16 15:58:54 baggins Exp $
 
 # NLS
 NLS_DOMAIN="rc-scripts"
@@ -199,8 +199,7 @@ case "$1" in
        echo "$tunnels"
 
        nls "Currently active devices and tunnels:"
-       /sbin/ip link show | egrep '^[^ ].*' | sed 's/[0-9]*: \(.*\):.*/\1/' | \
-               awk '{ printf("%s ",$0) }'; echo
+       /sbin/ip link show | awk -F":" ' (/UP/) { print $2 }' | xargs
        ;;
   restart)
        $0 stop
@@ -212,3 +211,6 @@ case "$1" in
 esac
 
 exit 0
+
+# This must be last line !
+# vi:syntax=sh:tw=78:ts=8:sw=4
index 8ebe21bdb7ce13f37d12099ecdf68a252137086b..18165b70f7ccfeb54fa8d99e9185aefa4a97604a 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.71 2000/08/04 13:58:52 marcus Exp $
+# $Id: rc.sysinit,v 1.72 2000/11/16 15:58:54 baggins Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -269,8 +269,11 @@ if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then
                        ktag="`cat /proc/version`"
                        mtag=grep -l "$ktag" /lib/modules/*/.rhkmvtag 2> /dev/null
                        if [ -n "$mtag" ]; then
-                               mver=echo $mtag | sed -e 's,/lib/modules/,,' -e 's, \
-                                       /.rhkmvtag,,' -e 's,[       ].*$,,'
+                               mver=$(echo $mtag | \
+                                       awk ' { gsub(/\/lib\/modules\//,NIL); \
+                                               gsub(/.rhkmvtag/,NIL); \
+                                               gsub(/[     ].*$/,NIL); \
+                                               print $0 } ')
                        fi
                        if [ -n "$mver" ]; then
                                ln -sf /lib/modules/$mver /lib/modules/default
@@ -515,3 +518,6 @@ if is_yes "$PROMPT"; then
    /sbin/getkey i && touch /var/run/confirm
 fi
 wait
+
+# This must be last line !
+# vi:syntax=sh:tw=78:ts=8:sw=4
index 45c2fca145bff4fa89c7712f05b03a4075eb404d..6f505d6f5c4331fc8dbfaa2bdc10881e4982f596 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifdown,v 1.25 2000/09/23 20:43:05 saq Exp $
+#      $Id: ifdown,v 1.26 2000/11/16 15:58:55 baggins Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -52,8 +52,10 @@ if [ -z "$NETMASK" -a -n "$PREFIX" ]; then
 fi
 
 FULLDEVNAME="$DEVICE"
-DEVICE=`echo $FULLDEVNAME | sed 's/:.*//g'`
-DEVICETYPE=`echo $DEVICE | sed "s/[0-9]*$//"`
+# detect network device type (ie. dummy, eth for dummy0, eth0 ..)
+DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*$/,NUL); print $0 } ')
+# real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
+DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
 OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}"
 
 if [ -x $OTHERSCRIPT ]; then
index 11b0c8ec1f5c050823f4696a4f167adc4aa60525..3a072a57966872e1bc443293e6b19130187bbbbb 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifdown-post,v 1.10 2000/03/27 16:07:52 misiek Exp $
+#      $Id: ifdown-post,v 1.11 2000/11/16 15:58:55 baggins Exp $
 #
 # This should be called whenever an interface goes down, not just when
 # it is brought down explicitly.
@@ -16,10 +16,10 @@ source_config
 
 # full device name as specified by user
 FULLDEVNAME="$DEVICE"
-# type of device for example "dummy" or "eth"
-DEVICETYPE=`echo $FULLDEVNAME | sed "s/[0-9]*$//"`
-# name of real device ie. eth0 when eth0,eth0:1,eth0:alias
-DEVICE=`echo $FULLDEVNAME | sed 's/:.*//g'`
+# detect network device type (ie. dummy, eth for dummy0, eth0 ..)
+DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*$/,NUL); print $0 } ')
+# real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
+DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
 
 if echo "$FULLDEVNAME" | grep -q ':' ; then
         ISALIAS=yes
index 78a48d2c9c042e112b3f38bd5aad0f8a8c746c30..bed41d6c2af3d1330c8b0fc84df4aba55308bc13 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup,v 1.52 2000/11/06 19:28:05 baggins Exp $
+#      $Id: ifup,v 1.53 2000/11/16 15:58:55 baggins Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -41,10 +41,10 @@ IPSETUP=no
 
 # full network device name
 FULLDEVNAME="$DEVICE"
-# real name of device (is eth0 for eth0,eth0:1,eth0:alias)
-DEVICE=`echo $FULLDEVNAME | sed 's/:.*//g'`
-# detect network device type (dummy, eth ..)
-DEVICETYPE=`echo $DEVICE | sed "s/[0-9]*$//"`
+# detect network device type (ie. dummy, eth for dummy0, eth0 ..)
+DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*$/,NUL); print $0 } ')
+# real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
+DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
 
 if echo "$FULLDEVNAME" | grep -q ':' ; then
     ISALIAS=yes
index 35e6b10e3f853cd03a6a23a1f1a7c90b58394385..51bb356dd3c6bb40d6b20706780685a4584c240e 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup-post,v 1.21 2000/06/12 08:38:15 waszi Exp $
+#      $Id: ifup-post,v 1.22 2000/11/16 15:58:55 baggins Exp $
 #
 
 run_up() { :; }
@@ -15,10 +15,10 @@ source_config
 
 # full device name as specified by user
 FULLDEVNAME="$DEVICE"
-# type of device for example "dummy" or "eth"
-DEVICETYPE=`echo $FULLDEVNAME | sed "s/[0-9]*$//"`
-# name of real device ie. eth0 when eth0,eth0:1,eth0:alias
-DEVICE=`echo $FULLDEVNAME | sed 's/:.*//g'`
+# detect network device type (ie. dummy, eth for dummy0, eth0 ..)
+DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*$/,NUL); print $0 } ')
+# real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
+DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
 
 get_ppp_device_and_pid
 
This page took 0.252729 seconds and 4 git commands to generate.