lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 10:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: allow dhcp for !wan

Browse Source
This commit is contained in:
Franco Fichtner 2017-05-11 21:19:05 +02:00
parent ed90ebd56d
commit b5505cb4d3
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/etc/rc.initial.setlanip
View File

@ -248,20 +248,18 @@ function console_configure_ip_address($version)
$upperifname = strtoupper($interface);
if ($interface == 'wan') {
if (console_prompt_for_yn(sprintf('Configure %s address %s interface via %s?', $label_IPvX, $upperifname, $label_DHCP), 'y')) {
$ifppp = console_get_interface_from_ppp(get_real_interface('wan'));
if (!empty($ifppp)) {
$ifaceassigned = $ifppp;
}
$intip = ($version === 6) ? 'dhcp6' : 'dhcp';
$intbits = '';
$isintdhcp = true;
$restart_dhcpd = true;
if (console_prompt_for_yn(sprintf('Configure %s address %s interface via %s?', $label_IPvX, $upperifname, $label_DHCP), 'y')) {
$ifppp = console_get_interface_from_ppp(get_real_interface($interface));
if (!empty($ifppp)) {
$ifaceassigned = $ifppp;
}
$intip = ($version === 6) ? 'dhcp6' : 'dhcp';
$intbits = '';
$isintdhcp = true;
$restart_dhcpd = true;
}
if ($isintdhcp == false or $interface <> "wan") {
if (!$isintdhcp) {
while (true) {
do {
echo "\n" . sprintf(
@ -465,10 +463,12 @@ if (!$config['interfaces']['lan']) {
$restart_dhcpd = true;
}
echo "\n";
write_config(sprintf('%s configuration from console menu', $interface));
interface_bring_down($interface);
interface_configure($interface, true);
interface_configure($interface, true, false, true);
filter_configure_sync(true);
if ($restart_dhcpd) {
@ -479,6 +479,8 @@ if ($restart_webgui) {
webgui_configure_do(true);
}
echo "\n";
$upperifname = strtoupper($interface);
if ($intip != '') {