From 00838b49ce43b4a55c19b41c0b276b238aacf424 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 6 May 2018 14:30:58 +0200
Subject: [PATCH] src: move dhclient-script to proper location

".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.
---
 plist                                                |  2 +-
 src/etc/inc/interfaces.inc                           | 12 ++++++------
 src/etc/rc.newwanip                                  |  1 -
 .../scripts/interfaces/dhclient-script}              |  0
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename src/{sbin/dhclient-script.ext => opnsense/scripts/interfaces/dhclient-script} (100%)

diff --git a/plist b/plist
index 601d3348b..5c86d14c3 100644
--- a/plist
+++ b/plist
@@ -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
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 814e4307f..800fb5659 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -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";
     }
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index acffa370a..07b5708be 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -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);
 }
diff --git a/src/sbin/dhclient-script.ext b/src/opnsense/scripts/interfaces/dhclient-script
similarity index 100%
rename from src/sbin/dhclient-script.ext
rename to src/opnsense/scripts/interfaces/dhclient-script