Author: glen
Date: Wed Feb 6 16:35:41 2013
New Revision: 12624
Modified:
rc-scripts/trunk/rc.d/init.d/network
Log:
more complete update for NM skipping. improves [12481] and [12616]
should the `$USERS` be dropped now, i don't see it from current NM generated
configs
M init.d/network
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 Wed Feb 6 16:35:41 2013
@@ -136,8 +136,8 @@
*ifcfg-lo) continue ;;
esac
DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
- [ ${USERS:-no} != no ] && continue
[ "${DEVICE:+set}" != "set" ] && continue
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -148,8 +148,8 @@
ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-macvlan*|ifcfg-macvtap*|ifcfg-*.*)
continue ;;
esac
DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
- [ ${USERS:-no} != no ] && continue
[ "${DEVICE:+set}" != "set" ] && continue
+ [ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
@@ -160,7 +160,8 @@
ifcfg-*.*) ;;
*) continue ;;
esac
- ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
+ [ "${DEVICE:+set}" != "set" ] && continue
[ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
@@ -172,7 +173,8 @@
ifcfg-br*) ;;
*) continue ;;
esac
- ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
+ [ "${DEVICE:+set}" != "set" ] && continue
[ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
@@ -184,7 +186,8 @@
ifcfg-macvtap*|ifcfg-macvlan*) ;;
*) continue ;;
esac
- ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
+ [ "${DEVICE:+set}" != "set" ] && continue
[ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
@@ -196,7 +199,8 @@
ifcfg-sit*) ;;
*) continue ;;
esac
- ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ DEVICE=""; ONBOOT=""; USERS=""; . "$i"
2>/dev/null
+ [ "${DEVICE:+set}" != "set" ] && continue
[ ${USERS:-no} != no ] && continue
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
@@ -205,7 +209,8 @@
tunnels=$(
for i in $(network_interface_configs 'tnlcfg-*'); do
- ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ [ "${DEVICE:+set}" != "set" ] && continue
[ ${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
