From 889af6da26028dfb8d9272a81ba9df862da4eaf9 Mon Sep 17 00:00:00 2001 From: Stanislav Ievlev Date: Wed, 14 Nov 2007 14:50:22 +0300 Subject: [PATCH] 0.8-alt7 - use new ifcheckwireless common script --- alterator-net-eth.spec | 5 ++++- alterator-net-eth/backend3/net-eth | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alterator-net-eth.spec b/alterator-net-eth.spec index 2bf2741..eccd54e 100644 --- a/alterator-net-eth.spec +++ b/alterator-net-eth.spec @@ -2,7 +2,7 @@ Name: alterator-net-eth Version: 0.8 -Release: alt6 +Release: alt7 Packager: Stanislav Ievlev @@ -52,6 +52,9 @@ alterator module for tcp/ip connections configuration %_alterator_backend3dir/* %changelog +* Wed Nov 14 2007 Stanislav Ievlev 0.8-alt7 +- use new ifcheckwireless common script + * Tue Oct 30 2007 Stanislav Ievlev 0.8-alt6 - fix iftab generation - move tools to alterator-net-common diff --git a/alterator-net-eth/backend3/net-eth b/alterator-net-eth/backend3/net-eth index 1baa46d..1713ab0 100755 --- a/alterator-net-eth/backend3/net-eth +++ b/alterator-net-eth/backend3/net-eth @@ -66,7 +66,7 @@ read_iface() local info= ifcheckup "$name" && info="`_ "interface is up"`" || info="`_ "interface is down"`" - if ! [ -d "/sys/class/net/$name/wireless" ];then + if ! ifcheckwireless "$name"; then ifcheckplug "$name" case "$?" in 2) info="$info, `_ "plugged"`" ;; @@ -75,7 +75,7 @@ read_iface() fi printf 'info "%s"' "$info" - printf 'wireless %s' "$([ -d "/sys/class/net/$name/wireless" ] && echo "#t" || echo "#f")" + printf 'wireless %s' "$(ifcheckwireless "$name" && echo "#t" || echo "#f")" local addr= ip= mask= bootproto= [ ! -s "/etc/net/ifaces/$name/ipv4address" ] ||