Merge commit 'origin/master' into next

[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 8e9fb31ce48dd4fcc9699fd53c8a88f661dd53c1..adab51bc1eea62f39c70c0e8101a43476534b5ed 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -1,10 +1,10 @@
-usr/local/bin/setaliases
-#usr/local/bin/applejuicectrl
 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/getipstat
 usr/local/bin/getiptstate
 #usr/local/bin/iowrap
@@ -18,8 +18,10 @@ 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/sambactrl
+usr/local/bin/setaliases
 usr/local/bin/setdmzholes
 usr/local/bin/setportfw
 usr/local/bin/setxtaccess
@@ -30,6 +32,9 @@ 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/urlfilterctrl
 usr/local/bin/wirelessctrl
 #usr/local/bin/wlanapctrl