Wieso sind denn Amavisd-new und Spamassassin in der ISO gelandet?

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@542 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/Mail-SpamAssassin b/config/rootfiles/packages/Mail-SpamAssassin
similarity index 100%
rename from config/rootfiles/common/Mail-SpamAssassin
rename to config/rootfiles/packages/Mail-SpamAssassin

diff --git a/config/rootfiles/common/amavisd b/config/rootfiles/packages/amavisd
similarity index 100%
rename from config/rootfiles/common/amavisd
rename to config/rootfiles/packages/amavisd

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 6ae7253d25901dbf82fb5efe40d2cbe7fe8aeb8a..1ccaa400310bbd3325e0e8e1cb263686ef003909 100644 (file)
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -1199,9 +1199,11 @@ sub buildconf {
            print FILE "} #$itf\n";
 
            system ('/usr/bin/touch', "${General::swroot}/dhcp/enable_${lc_itf}");
+           system ('/usr/local/bin/dhcpctrl enable');
            &General::log("DHCP on ${itf}: " . $Lang::tr{'dhcp server enabled'})
        } else {
            unlink "${General::swroot}/dhcp/enable_${lc_itf}";
+           system ('/usr/local/bin/dhcpctrl disable');
            &General::log("DHCP on ${itf}: " . $Lang::tr{'dhcp server disabled'})
        }
     }