michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use INTERFACESv4 variable if defined https://sourceforge.net/p/webadmin/bugs/5556/

Browse Source
This commit is contained in:
Jamie Cameron
2022-04-12 20:56:24 -07:00
parent c9b5950efb
commit b0da3b6df3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dhcpd/edit_iface.cgi
View File

@@ -38,7 +38,7 @@ elsif ($config{'interfaces_type'} eq 'debian') {
if (-r "/etc/default/isc-dhcp-server") {
# Debian 6+ uses a new environment file
&read_env_file("/etc/default/isc-dhcp-server", \%dhcpd);
$iface = $dhcpd{'INTERFACES'};
$iface = $dhcpd{'INTERFACES'} || $dhcpd{'INTERFACESv4'};
}
elsif (-r "/etc/default/dhcp") {
# New debian uses an environment file

7
dhcpd/save_iface.cgi
View File

@@ -57,7 +57,12 @@ elsif ($config{'interfaces_type'} eq 'debian') {
if (-r "/etc/default/isc-dhcp-server") {
# Write to Debian 6.0 environment file
&read_env_file("/etc/default/isc-dhcp-server", \%dhcpd);
$dhcpd{'INTERFACES'} = $iface;
if (defined($dhcpd{'INTERFACESv4'})) {
$dhcpd{'INTERFACESv4'} = $iface;
}
else {
$dhcpd{'INTERFACES'} = $iface;
}
&write_env_file("/etc/default/isc-dhcp-server", \%dhcpd);
}
elsif (-r "/etc/default/dhcp") {