projects / packages / rc-scripts.git / blame
| Commit | Line | Data |
|---|---|---|
| 207132f5 BZ |
1 | --- rc-scripts-0.4.5.2/rc.d/init.d/network.orig 2011-12-14 12:23:30.000000000 +0100 |
| 2 | +++ rc-scripts-0.4.5.2/rc.d/init.d/network 2012-01-25 10:37:12.670299072 +0100 | |
| 3 | @@ -135,7 +135,8 @@ | |
| 4 | case $i in | |
| 5 | *ifcfg-lo) continue ;; | |
| 6 | esac | |
| 7 | - ONBOOT=""; . "$i" 2>/dev/null | |
| 8 | + ONBOOT=""; USERS=""; . "$i" 2>/dev/null | |
| 9 | + [ ${USERS:-no} != no ] && continue | |
| 10 | [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" | |
| 11 | done | |
| 12 | ` | |
| 13 | @@ -145,7 +146,8 @@ | |
| 14 | case ${i##*/} in | |
| 15 | ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-*.*) continue ;; | |
| 16 | esac | |
| 17 | - ONBOOT=""; . "$i" 2>/dev/null | |
| 18 | + ONBOOT=""; USERS=""; . "$i" 2>/dev/null | |
| 19 | + [ ${USERS:-no} != no ] && continue | |
| 20 | [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" | |
| 21 | done | |
| 22 | ` | |
| 23 | @@ -156,7 +158,8 @@ | |
| 24 | ifcfg-*.*) ;; | |
| 25 | *) continue ;; | |
| 26 | esac | |
| 27 | - ONBOOT=""; . "$i" 2>/dev/null | |
| 28 | + ONBOOT=""; USERS=""; . "$i" 2>/dev/null | |
| 29 | + [ ${USERS:-no} != no ] && continue | |
| 30 | [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" | |
| 31 | done | |
| 32 | ` | |
| 33 | @@ -167,7 +170,8 @@ | |
| 34 | ifcfg-br*) ;; | |
| 35 | *) continue ;; | |
| 36 | esac | |
| 37 | - ONBOOT=""; . "$i" 2>/dev/null | |
| 38 | + ONBOOT=""; USERS=""; . "$i" 2>/dev/null | |
| 39 | + [ ${USERS:-no} != no ] && continue | |
| 40 | [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" | |
| 41 | done | |
| 42 | ` | |
| 43 | @@ -178,7 +182,8 @@ | |
| 44 | ifcfg-sit*) ;; | |
| 45 | *) continue ;; | |
| 46 | esac | |
| 47 | - ONBOOT=""; . "$i" 2>/dev/null | |
| 48 | + ONBOOT=""; USERS=""; . "$i" 2>/dev/null | |
| 49 | + [ ${USERS:-no} != no ] && continue | |
| 50 | [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" | |
| 51 | done | |
| 52 | ` | |
| 53 | @@ -186,7 +191,8 @@ | |
| 54 | ||
| 55 | tunnels=$( | |
| 56 | for i in $(network_interface_configs 'tnlcfg-*'); do | |
| 57 | - ONBOOT=""; . "$i" 2>/dev/null | |
| 58 | + ONBOOT=""; USERS=""; . "$i" 2>/dev/null | |
| 59 | + [ ${USERS:-no} != no ] && continue | |
| 60 | [ ${ONBOOT:-no} = yes ] && echo "${i##*/tnlcfg-}" | |
| 61 | done | |
| 62 | ) |