Author: baggins
Date: Sun Feb 19 19:33:15 2012
New Revision: 12481
Modified:
rc-scripts/trunk/rc.d/init.d/network
Log:
- skip interfaces configured by NetworkManager, by cactus/at/pld-linux.org
Modified: rc-scripts/trunk/rc.d/init.d/network
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/network (original)
+++ rc-scripts/trunk/rc.d/init.d/network Sun Feb 19 19:33:15 2012
@@ -135,7 +135,8 @@
case $i in
*ifcfg-lo) continue ;;
esac
- ONBOOT=""; . "$i" 2>/dev/null
+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -145,7 +146,8 @@
case ${i##*/} in
ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-macvlan*|ifcfg-macvtap*|ifcfg-*.*)
continue ;;
esac
- ONBOOT=""; . "$i" 2>/dev/null
+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -156,7 +158,8 @@
ifcfg-*.*) ;;
*) continue ;;
esac
- ONBOOT=""; . "$i" 2>/dev/null
+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -167,7 +170,8 @@
ifcfg-br*) ;;
*) continue ;;
esac
- ONBOOT=""; . "$i" 2>/dev/null
+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -178,7 +182,8 @@
ifcfg-macvtap*|ifcfg-macvlan*) ;;
*) continue ;;
esac
- ONBOOT=""; . "$i" 2>/dev/null
+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -189,7 +194,8 @@
ifcfg-sit*) ;;
*) continue ;;
esac
- ONBOOT=""; . "$i" 2>/dev/null
+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -197,7 +203,8 @@
tunnels=$(
for i in $(network_interface_configs 'tnlcfg-*'); do
- ONBOOT=""; . "$i" 2>/dev/null
+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/tnlcfg-}"
done
)
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
