summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-09-03 10:54:15 +0000
committerErmal <eri@pfsense.org>2010-09-03 10:54:15 +0000
commitce96805161ccd07184afb2d68c3e3d5961972337 (patch)
tree83c03bd826e05901af104713a2a00ea33a0005e2 /etc/inc
parent18de07280116112989a1b6298faba22460e91d54 (diff)
downloadpfsense-ce96805161ccd07184afb2d68c3e3d5961972337.zip
pfsense-ce96805161ccd07184afb2d68c3e3d5961972337.tar.gz
Upgrade user data too for new pppoe world.
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/upgrade_config.inc11
1 files changed, 11 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 356fc8c..e83b0e4 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2163,6 +2163,17 @@ function upgrade_067_to_068() {
$config['pppoes'] = array();
$config['pppoes']['pppoe'] = array();
$config['pppoes']['pppoe'][] = $config['pppoe'][0];
+
+ if (is_array($config['pppoe']['user'])) {
+ $username = array();
+ foreach ($config['pppoe']['user'] as $user) {
+ $usr = "{$user['name']}:{$user['password']}";
+ if ($user['ip'])
+ $usr .= ":{$user['ip']}";
+ $username[] = $usr;
+ }
+ $config['pppoes']['pppoe'][0]['username'] = implode(" ", $username);
+ }
unset($config['pppoe']);
}
}
OpenPOWER on IntegriCloud