From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Mon, 7 May 2007 19:51:13 +0000 (+0000)
Subject: Wieso sind denn Amavisd-new und Spamassassin in der ISO gelandet?
X-Git-Tag: v2.3-beta1~717
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=26f58f3d030272b405acbcf1df624d3b98c97d6e

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 6ae7253d25..1ccaa40031 100644
--- 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'})
 	}
     }