diff options
| author | Colin Guthrie <colin@mageia.org> | 2012-03-18 23:41:36 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2012-03-18 23:41:36 +0000 |
| commit | 8f85566feeb57e8385c7e024cdde021e3f041bc2 (patch) | |
| tree | e55da47709b2c45acca066c05fb44fa76ad5ab61 | |
| parent | 3b975571876b0113542a8932b42bcb683567474d (diff) | |
| download | initscripts-8f85566feeb57e8385c7e024cdde021e3f041bc2.tar initscripts-8f85566feeb57e8385c7e024cdde021e3f041bc2.tar.gz initscripts-8f85566feeb57e8385c7e024cdde021e3f041bc2.tar.bz2 initscripts-8f85566feeb57e8385c7e024cdde021e3f041bc2.tar.xz initscripts-8f85566feeb57e8385c7e024cdde021e3f041bc2.zip | |
Ignore 'Wireless' network config files.
Network manager does not write SLAVE=yes, but they are
effectively slave connections. We should not start these
interfaces directly.
Also use /bin/ls directly to avoid any aliasing (not that
this should be an issue in a script context)
| -rwxr-xr-x | rc.d/init.d/network | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 9b86aa70..38d081d6 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -51,7 +51,7 @@ cd /etc/sysconfig/network-scripts # find all the interfaces besides loopback. # ignore aliases, alternative configurations, and editor backup files -interfaces=$(ls ifcfg* | \ +interfaces=$(/bin/ls ifcfg* | \ LC_ALL=C sed -e "$__sed_discard_ignored_files" \ -e '/\(ifcfg-lo$\|:\|ifcfg-.*-range\)/d' \ -e '/ifcfg-[A-Za-z0-9#\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \ @@ -126,6 +126,9 @@ case "$1" in if [ "$SLAVE" = "yes" ]; then continue fi + if [ "$TYPE" = "Wireless" ]; then + continue + fi if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then vpninterfaces="$vpninterfaces $i" |