]> git.pld-linux.org Git - packages/rc-scripts.git/commitdiff
projects / packages / rc-scripts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ee1468)
- updated to 0.4.0.22
authorJan Rękorajski <baggins@pld-linux.org>
Tue, 22 Nov 2005 18:58:59 +0000 (18:58 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rc-scripts-dev_alias.patch -> 1.5
    rc-scripts-locale.patch -> 1.2

rc-scripts-dev_alias.patch patch | blob | blame | history
rc-scripts-locale.patch patch | blob | blame | history

diff --git a/rc-scripts-dev_alias.patch b/rc-scripts-dev_alias.patch
index 5d02bc33aa2dd07a96eb680156084aabe7dc2fbb..e20fe4b567169592a1c12f5b380ad0b83cc69804 100644 (file)
--- a/rc-scripts-dev_alias.patch
+++ b/rc-scripts-dev_alias.patch
@@ -7,60 +7,60 @@
 -              LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \
 +              LC_ALL=C egrep 'ifcfg-[a-z0-9\.:]+$' | \
                for i in `cat`; do \
-                   ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \
-               done | \
+                       ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; \
+                       is_yes "$ONBOOT" && echo "$i"; \
 --- ./sysconfig/network-scripts/ifdown.org     2005-03-29 20:07:36.559401832 +0200
 +++ ./sysconfig/network-scripts/ifdown 2005-03-29 20:09:44.281985048 +0200
 @@ -109,8 +109,12 @@
-       ip link set ${DEVICE} down
-     fi
+               ip link set ${DEVICE} down
+       fi
  else
--    ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
--    ip link set ${DEVICE} down
-+    if [ -n "${SUBDEVICE}" ]; then
-+      ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
-+    else
-+      ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
-+      ip link set ${DEVICE} down
-+    fi
- fi    
+-      ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
+-      ip link set ${DEVICE} down
++      if [ -n "${SUBDEVICE}" ]; then
++              ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
++      else
++              ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
++              ip link set ${DEVICE} down
++      fi
+ fi
  
  if [ "$HANDLING" = "4" ]; then
 --- ./sysconfig/network-scripts/functions.network.org  2005-03-29 20:10:14.405405592 +0200
 +++ ./sysconfig/network-scripts/functions.network      2005-03-29 20:13:29.813699016 +0200
 @@ -148,7 +148,7 @@
  {
- # 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 } ')
-+    DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?:?[0-9]*$/,NUL); print $0 } ')
- 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 } ')
++              DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?:?[0-9]*$/,NUL); print $0 } ')
+       fi
  
  # Setup DEVICETYPE for special cases.
 @@ -157,6 +157,7 @@
  fi
  
- # real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
-+SUBDEVICE=$(echo "$DEVICE" | egrep "([0-9]+:[0-9]+)" )
- DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
+       # real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
++      SUBDEVICE=$(echo "$DEVICE" | egrep "([0-9]+:[0-9]+)" )
+       DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
  
- eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
+       eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
 --- ./sysconfig/network-scripts/ifup.org       2005-03-29 20:14:19.329171520 +0200
 +++ ./sysconfig/network-scripts/ifup   2005-03-29 20:16:31.832028024 +0200
 @@ -176,10 +176,14 @@
-           IP4ADDROPT="brd + ${IP4ADDROPT}"
-       fi
+                       IP4ADDROPT="brd + ${IP4ADDROPT}"
+               fi
  
-+      if [ -n "${SUBDEVICE}" ]; then
-+          ALIAS="label ${SUBDEVICE}"
-+      fi
++              if [ -n "${SUBDEVICE}" ]; then
++                      ALIAS="label ${SUBDEVICE}"
++              fi
 +
-       if [ -n "$REMIP" ]; then
--          ip addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE} ${IP4ADDROPT}
-+          ip addr add ${IP4ADDR} peer ${REMIP} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
-       else
--          ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
-+          ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
+               if [ -n "$REMIP" ]; then
+-                      ip addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE} ${IP4ADDROPT}
++                      ip addr add ${IP4ADDR} peer ${REMIP} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
+               else
+-                      ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
++                      ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
+               fi
        fi
-     fi
  
diff --git a/rc-scripts-locale.patch b/rc-scripts-locale.patch
index 373270ba2294d49ac4ac0868d4c7d60e3b1e8b22..0f9b669d6422aab93777e81017e067c0df95af05 100644 (file)
--- a/rc-scripts-locale.patch
+++ b/rc-scripts-locale.patch
@@ -2,22 +2,22 @@ diff -urN rc-scripts-0.4.0.21.orig/lang.sh rc-scripts-0.4.0.21/lang.sh
 --- rc-scripts-0.4.0.21.orig/lang.sh   2003-10-28 02:10:55.000000000 +0100
 +++ rc-scripts-0.4.0.21/lang.sh        2005-11-10 22:51:23.231869250 +0100
 @@ -7,11 +7,17 @@
-     . /etc/sysconfig/i18n
+       . /etc/sysconfig/i18n
  
-    [ -n "$LANG" ] && export LANG || unset LANG
--   [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
-+   [ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
-    [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
-+   [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
-+   [ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION
-+   [ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT
-    [ -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_NAME" ] && export LC_NAME || unset LC_NAME
-+   [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
-+   [ -n "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER
-+   [ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE
-    [ -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 "$LANG" ] && export LANG || unset LANG
+-      [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
++      [ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS
+       [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
++      [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
++      [ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION || unset LC_IDENTIFICATION
++      [ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT || unset LC_MEASUREMENT
+       [ -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_NAME" ] && export LC_NAME || unset LC_NAME
++      [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
++      [ -n "$LC_PAPER" ] && export LC_PAPER || unset LC_PAPER
++      [ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE || unset LC_TELEPHONE
+       [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
+       [ -n "$LC_ALL" ] && export LC_ALL || unset LC_ALL
+       [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
inittab and /etc/rc.d scripts
This page took 0.137685 seconds and 4 git commands to generate.