Merge commit 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2011-09-03 16:05:55 +02:00
8 changed files with 46 additions and 5 deletions

View File

@@ -1 +1,2 @@
srv/web/ipfire/html/proxy.pac
var/updatecache

View File

@@ -0,0 +1 @@
../../../common/apache2

View File

@@ -0,0 +1 @@
../../../common/ethtool

View File

@@ -2,3 +2,5 @@ etc/system-release
var/ipfire/langs/
etc/rc.d/init.d/console
usr/local/sbin/setup
usr/local/bin/setddns.pl
srv/web/ipfire/cgi-bin/ddns.cgi

View File

@@ -34,6 +34,7 @@ done
#
#Stop services
/etc/init.d/apache stop
#
#Extract files
@@ -41,6 +42,7 @@ extract_files
#
#Start services
/etc/init.d/apache start
#
#Update Language cache