lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

sbin: remove system directory from repo

Browse Source 
* 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.
This commit is contained in:
Franco Fichtner 2014-11-30 12:29:09 +01:00
parent d27e26146f
commit 7ef4a24979
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/inc/interfaces.inc
View File

@ -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);

5
sbin/athctrl.sh → usr/local/sbin/athctrl
View File

@ -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

0
sbin/dhclient-script → usr/local/sbin/dhclient-script.ext
View File