Merge remote-tracking branch 'origin/next' into thirteen

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / misc-progs

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index e9cb406606eeaed20d76956c554820c245112372..2d6b2e2cb4b863b7799ba978d068c94378f90da3 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -1,8 +1,11 @@
+usr/local/bin/addonctrl
 #usr/local/bin/applejuicectrl
 usr/local/bin/backupctrl
 #usr/local/bin/clamavctrl
 usr/local/bin/dhcpctrl
 usr/local/bin/extrahdctrl
+usr/local/bin/fireinfoctrl
+usr/local/bin/getconntracktable
 usr/local/bin/getipstat
 #usr/local/bin/iowrap
 usr/local/bin/ipfirereboot
@@ -15,17 +18,23 @@ usr/local/bin/outgoingfwctrl
 usr/local/bin/pakfire
 usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
+usr/local/bin/rebuildroutes
 usr/local/bin/redctrl
-usr/local/bin/restartssh
-usr/local/bin/restartwireless
 #usr/local/bin/sambactrl
+usr/local/bin/setaliases
 usr/local/bin/setdmzholes
 usr/local/bin/setportfw
 usr/local/bin/setxtaccess
 usr/local/bin/smartctrl
 usr/local/bin/snortctrl
 usr/local/bin/squidctrl
+usr/local/bin/sshctrl
+usr/local/bin/syslogdctrl
 usr/local/bin/timectrl
 #usr/local/bin/tripwirectrl
+usr/local/bin/updxlratorctrl
+usr/local/bin/updxsetperms
 usr/local/bin/upnpctrl
-usr/local/bin/restartsyslogd
+usr/local/bin/urlfilterctrl
+usr/local/bin/wirelessctrl
+#usr/local/bin/wlanapctrl