diff --git a/net-analyzer/fprobe/files/conf.d-fprobe b/net-analyzer/fprobe/files/conf.d-fprobe index f73ccf4c58..a93c5c10b2 100644 --- a/net-analyzer/fprobe/files/conf.d-fprobe +++ b/net-analyzer/fprobe/files/conf.d-fprobe @@ -23,7 +23,7 @@ IFACE=eth0 #LOCALIP= # SNMP iface id -SNMP_IFACE="${IFACE//eth}" +SNMP_IFACE="${IFACE#eth}" # Maximum number of concurrent flows to track # using a specified amount of memory diff --git a/net-analyzer/fprobe/files/init.d-fprobe b/net-analyzer/fprobe/files/init.d-fprobe index efa5357177..c470af432c 100644 --- a/net-analyzer/fprobe/files/init.d-fprobe +++ b/net-analyzer/fprobe/files/init.d-fprobe @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 depend() { @@ -14,14 +14,14 @@ PIDFILE="/var/run/fprobe$PIDFILE_EXTRA.pid" start() { ebegin "Starting fprobe" local OPTS="" - [ "${PROMISC}" == "yes" ] || OPTS="${OPTS} -p" + [ "${PROMISC}" = "yes" ] || OPTS="${OPTS} -p" [ -n "${FILTER}" ] && OPTS="${OPTS} -f '${FILTER}'" for optname in i:IFACE s:TIMER_EXPIRED g:TIME_FRAGMENTED d:TIMER_IDLE \ e:TIMER_ACTIVE n:FLOW_VER a:LOCALIP x:SNMP_IFACE b:MEMBULK \ m:MEMLIMIT q:PENDING B:KERNBUF r:RTPRIO t:DELAY S:SNAPLEN \ c:CHROOT u:USER v:LOGLEVEL ; do - opt="${optname/:*}" optvar="${optname/*:}" - optvalue="${!optvar}" + opt="${optname%:*}" optvar="${optname#*:}" + eval optvalue='$'$optvar [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}" done OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}"