From 7ef4a24979fc1df7170a1e2f4f812abf999971b1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 30 Nov 2014 12:29:09 +0100
Subject: [PATCH] sbin: remove system directory from repo

* Shift athctrl to /usr/local, and lose the ".sh" prefix as the
  common practice is to not use a suffix for those utilities.  Also
  sync the file with src.git/tools/tools/ath/athctrl.sh, even
  though the changes are only cosmetic.

* /sbin/dhclient-script already exists and was overwritten.  Worse
  still, /usr/local/sbin/dhclient-script also exists.  To "clean"
  this up, rename the modified file to dhclient-script.ext.  Our
  management system picks up the correct file anyway.
---
 etc/inc/interfaces.inc                                     | 6 +++---
 sbin/athctrl.sh => usr/local/sbin/athctrl                  | 5 +++--
 sbin/dhclient-script => usr/local/sbin/dhclient-script.ext | 0
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename sbin/athctrl.sh => usr/local/sbin/athctrl (96%)
 rename sbin/dhclient-script => usr/local/sbin/dhclient-script.ext (100%)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 488fb2015..74b05ec7e 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2645,7 +2645,7 @@ EOD;
 	/* set ack timers according to users preference (if he/she has any) */
 	if($distance) {
 		fwrite($fd_set, "# Enable ATH distance settings\n");
-		fwrite($fd_set, "/sbin/athctrl.sh -i {$baseif} -d {$distance}\n");
+		fwrite($fd_set, "/usr/local/sbin/athctrl -i {$baseif} -d {$distance}\n");
 	}
 
 	if (isset($wlcfg['wpa']['enable'])) {
@@ -3865,7 +3865,7 @@ retry 15;
 select-timeout 0;
 initial-interval 1;
 	{$dhclientconf_hostname}
-	script "/sbin/dhclient-script";
+	script "/usr/local/sbin/dhclient-script.ext";
 EOD;
 
 if (is_ipaddrv4($wancfg['dhcprejectfrom'])) {
@@ -3976,7 +3976,7 @@ function DHCP_Config_File_Advanced($interface, $wancfg, $wanif) {
  	$dhclientconf .= "{$required_options}";
  	$dhclientconf .= "{$option_modifiers}";
  	$dhclientconf .= "\n";
- 	$dhclientconf .= "\tscript \"/sbin/dhclient-script\";\n";
+ 	$dhclientconf .= "\tscript \"/usr/local/sbin/dhclient-script.ext\";\n";
  	$dhclientconf .= "}\n";
 
 	$dhclientconf = DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf);
diff --git a/sbin/athctrl.sh b/usr/local/sbin/athctrl
similarity index 96%
rename from sbin/athctrl.sh
rename to usr/local/sbin/athctrl
index 6ba35ff01..5adee1c3c 100755
--- a/sbin/athctrl.sh
+++ b/usr/local/sbin/athctrl
@@ -1,9 +1,11 @@
-#!/bin/sh
+#! /bin/sh
 #
 # Set the IFS parameters for an interface configured for
 # point-to-point use at a specific distance.  Based on a
 # program by Gunter Burchardt.
 #
+# $FreeBSD$
+#
 DEV=ath0
 d=0
 
@@ -38,4 +40,3 @@ ATHN=`echo $DEV | sed 's/ath//'`
 sysctl dev.ath.$ATHN.slottime=$slottime
 sysctl dev.ath.$ATHN.acktimeout=$timeout
 sysctl dev.ath.$ATHN.ctstimeout=$timeout
-
diff --git a/sbin/dhclient-script b/usr/local/sbin/dhclient-script.ext
similarity index 100%
rename from sbin/dhclient-script
rename to usr/local/sbin/dhclient-script.ext