diff options
| author | gnhb <gnoahb@gmail.com> | 2010-06-07 23:24:17 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-06-07 23:24:17 +0700 |
| commit | 277d0250b0b344893c166df91cb66c2269ade1de (patch) | |
| tree | 366643a754c140a34db43d4266c8a88b5ca49e60 /etc/inc/pfsense-utils.inc | |
| parent | c1cc447c5d439e973f7d0915d95ad998c575eb65 (diff) | |
| parent | 692730bf32b6658bee626c2bb58ffce54b7bcb14 (diff) | |
| download | pfsense-277d0250b0b344893c166df91cb66c2269ade1de.zip pfsense-277d0250b0b344893c166df91cb66c2269ade1de.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
etc/inc/interfaces.inc
etc/inc/pfsense-utils.inc
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 57d900f..9b30248 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1273,7 +1273,7 @@ function get_interface_info($ifdescr) { break; if (file_exists($dev)) { if (file_exists("{$g['varrun_path']}/ppp_{$ifdescr}.pid")) { - $ifinfo['pppinfo'] = $ifinfo['if']; + $ifinfo['pppinfo'] = $ifinfo['ifdescr']; $sec = trim(`/usr/local/sbin/ppp-uptime.sh {$ifinfo['if']}`); $ifinfo['ppp_uptime'] = convert_seconds_to_hms($sec); } |
