Merge branch '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 65e1920a7c02b772c006bff99a035e1c2c579190..adab51bc1eea62f39c70c0e8101a43476534b5ed 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -1,29 +1,40 @@
+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/installfcdsl
-#usr/local/bin/installpackage
+usr/local/bin/getiptstate
 #usr/local/bin/iowrap
-usr/local/bin/ipfirebackup
-usr/local/bin/ipfirebkcfg
 usr/local/bin/ipfirereboot
-usr/local/bin/ipfirerscfg
 usr/local/bin/ipsecctrl
 usr/local/bin/launch-ether-wake
 usr/local/bin/logwatch
+#usr/local/bin/mpfirectrl
 usr/local/bin/openvpnctrl
+usr/local/bin/outgoingfwctrl
+usr/local/bin/pakfire
 usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
-usr/local/bin/restartapplejuice
-usr/local/bin/restartdhcp
-usr/local/bin/restartntpd
-usr/local/bin/restartsnort
-usr/local/bin/restartsquid
-usr/local/bin/restartssh
-usr/local/bin/restartsyslogd
-usr/local/bin/restartwireless
+usr/local/bin/rebuildroutes
+usr/local/bin/redctrl
+#usr/local/bin/sambactrl
 usr/local/bin/setaliases
-usr/local/bin/setdate
 usr/local/bin/setdmzholes
-usr/local/bin/setfilters
 usr/local/bin/setportfw
 usr/local/bin/setxtaccess
-usr/local/bin/timecheckctrl
+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/urlfilterctrl
+usr/local/bin/wirelessctrl
+#usr/local/bin/wlanapctrl