Author: glen
Date: Tue Feb 5 16:04:58 2013
New Revision: 12616
Modified:
rc-scripts/trunk/rc.d/init.d/network
Log:
ignore ifcfg-* files which have no DEVICE line present, i.e WiFi networks
generated by NM
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 Tue Feb 5 16:04:58 2013
@@ -135,8 +135,9 @@
case $i in
*ifcfg-lo) continue ;;
esac
- ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
[ ${USERS:-no} != no ] && continue
+ [ "${DEVICE:+set}" != "set" ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -146,8 +147,9 @@
case ${i##*/} in
ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-macvlan*|ifcfg-macvtap*|ifcfg-*.*)
continue ;;
esac
- ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
[ ${USERS:-no} != no ] && continue
+ [ "${DEVICE:+set}" != "set" ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
