Commit 7ef4a249 authored by Franco Fichtner's avatar Franco Fichtner

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.
parent d27e2614
...@@ -2645,7 +2645,7 @@ EOD; ...@@ -2645,7 +2645,7 @@ EOD;
/* set ack timers according to users preference (if he/she has any) */ /* set ack timers according to users preference (if he/she has any) */
if($distance) { if($distance) {
fwrite($fd_set, "# Enable ATH distance settings\n"); 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'])) { if (isset($wlcfg['wpa']['enable'])) {
...@@ -3865,7 +3865,7 @@ retry 15; ...@@ -3865,7 +3865,7 @@ retry 15;
select-timeout 0; select-timeout 0;
initial-interval 1; initial-interval 1;
{$dhclientconf_hostname} {$dhclientconf_hostname}
script "/sbin/dhclient-script"; script "/usr/local/sbin/dhclient-script.ext";
EOD; EOD;
if (is_ipaddrv4($wancfg['dhcprejectfrom'])) { if (is_ipaddrv4($wancfg['dhcprejectfrom'])) {
...@@ -3976,7 +3976,7 @@ function DHCP_Config_File_Advanced($interface, $wancfg, $wanif) { ...@@ -3976,7 +3976,7 @@ function DHCP_Config_File_Advanced($interface, $wancfg, $wanif) {
$dhclientconf .= "{$required_options}"; $dhclientconf .= "{$required_options}";
$dhclientconf .= "{$option_modifiers}"; $dhclientconf .= "{$option_modifiers}";
$dhclientconf .= "\n"; $dhclientconf .= "\n";
$dhclientconf .= "\tscript \"/sbin/dhclient-script\";\n"; $dhclientconf .= "\tscript \"/usr/local/sbin/dhclient-script.ext\";\n";
$dhclientconf .= "}\n"; $dhclientconf .= "}\n";
$dhclientconf = DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf); $dhclientconf = DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf);
......
#!/bin/sh #! /bin/sh
# #
# Set the IFS parameters for an interface configured for # Set the IFS parameters for an interface configured for
# point-to-point use at a specific distance. Based on a # point-to-point use at a specific distance. Based on a
# program by Gunter Burchardt. # program by Gunter Burchardt.
# #
# $FreeBSD$
#
DEV=ath0 DEV=ath0
d=0 d=0
...@@ -38,4 +40,3 @@ ATHN=`echo $DEV | sed 's/ath//'` ...@@ -38,4 +40,3 @@ ATHN=`echo $DEV | sed 's/ath//'`
sysctl dev.ath.$ATHN.slottime=$slottime sysctl dev.ath.$ATHN.slottime=$slottime
sysctl dev.ath.$ATHN.acktimeout=$timeout sysctl dev.ath.$ATHN.acktimeout=$timeout
sysctl dev.ath.$ATHN.ctstimeout=$timeout sysctl dev.ath.$ATHN.ctstimeout=$timeout
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment