lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: move dhclient-script to proper location

Browse Source 
".ext" came to be because dhclient-script from BSD is also under sbin/,
but since we always explicity use this one just move it to a neutral
location and point to it.
This commit is contained in:
Franco Fichtner 2018-05-06 14:30:58 +02:00
parent ee87e1a7a6
commit 00838b49ce
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plist
View File

@ -640,6 +640,7 @@
/usr/local/opnsense/scripts/firmware/type.sh
/usr/local/opnsense/scripts/firmware/unlock.sh
/usr/local/opnsense/scripts/firmware/upgrade.sh
/usr/local/opnsense/scripts/interfaces/dhclient-script
/usr/local/opnsense/scripts/interfaces/list_arp.py
/usr/local/opnsense/scripts/interfaces/list_macdb.py
/usr/local/opnsense/scripts/interfaces/list_ndp.py
@ -985,7 +986,6 @@
/usr/local/sbin/3gstats.php
/usr/local/sbin/beep.sh
/usr/local/sbin/configctl
/usr/local/sbin/dhclient-script.ext
/usr/local/sbin/mpd.script
/usr/local/sbin/opnsense-auth
/usr/local/sbin/opnsense-importer

12
src/etc/inc/interfaces.inc
View File

@ -3309,12 +3309,12 @@ function interface_dhcp_configure($interface = 'wan')
$dhclientconf = "";
$dhclientconf .= <<<EOD
interface "{$wanif}" {
timeout 60;
retry 15;
select-timeout 0;
initial-interval 1;
timeout 60;
retry 15;
select-timeout 0;
initial-interval 1;
{$dhclientconf_hostname}
script "/usr/local/sbin/dhclient-script.ext";
script "/usr/local/opnsense/scripts/interfaces/dhclient-script";
EOD;
if (is_ipaddrv4($wancfg['dhcprejectfrom'])) {
@ -3430,7 +3430,7 @@ function DHCP_Config_File_Advanced($interface, $wancfg, $wanif)
$dhclientconf .= "{$required_options}";
$dhclientconf .= "{$option_modifiers}";
$dhclientconf .= "\n";
$dhclientconf .= "\tscript \"/usr/local/sbin/dhclient-script.ext\";\n";
$dhclientconf .= "\tscript \"/usr/local/opnsense/scripts/interfaces/dhclient-script\";\n";
if (is_ipaddrv4($wancfg['dhcprejectfrom'])) {
$dhclientconf .= "\treject {$wancfg['dhcprejectfrom']};\n";
}

1
src/etc/rc.newwanip
View File

@ -86,7 +86,6 @@ $cacheip_file = "/var/db/{$interface}_cacheip";
$ip_file = "/var/db/{$interface}_ip";
/* write the current interface IP to file */
/* used in src/sbin/dhclient-script.ext */
if (is_ipaddr($ip)) {
@file_put_contents($ip_file, $ip);
}

0
src/sbin/dhclient-script.ext → src/opnsense/scripts/interfaces/dhclient-script
View File