konevsa/alterator-net-functions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use list_etcnet_iface_filtered for list_ppp()

Browse Source 
And add ifaces directory as second argument to list_ppp().
This commit is contained in:
Mikhail Efremov 2016-03-11 21:25:32 +03:00
parent 88cdd0c475
commit 12565b2122
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
alterator-net-functions/alterator-net-functions
View File

@ -550,6 +550,21 @@ __filter_etcnet_iface_default()
[ -n "$ifname" -a "$ifname" != "lo" -a "$ifname" != "default" -a "$ifname" != "unknown" ]
}
__filter_iface_ppp()
{
local ifacedir="$1"
local t="${2:-}"
__filter_etcnet_iface_default "$ifacedir" || return 1
[ "$(read_iface_option "$ifacedir" TYPE)" = "ppp" ] || return 1
if [ -n "$t" ]; then
[ "$(read_iface_option "$ifacedir" PPPTYPE)" = "$t" ] || return 1
fi
return 0
}
### list various interface types
# list_etcnet_iface_filtered [ ifaces_dir [ filter_func [ filter_func params ... ]]]
#
@ -577,12 +592,10 @@ list_etcnet_iface_filtered()
list_ppp()
{
local t="${1:-}"
for i in `find "$etcnet_iface_dir" -type d`; do
[ "$(read_iface_option "$i" TYPE)" != "ppp" ] ||
[ -n "$t" -a "$(read_iface_option "$i" PPPTYPE)" != "$t" ] ||
echo "${i##*/}" 2>/dev/null
done
local t="${1:-}"
local dir="${2:-}"
list_etcnet_iface_filtered "$dir" __filter_iface_ppp "$t"
}
list_bond()