Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/config/etc/fstab b/config/etc/fstab
index 15475c2e1d18f9de851400c0250318a7df31af03..693db126a5e2f23bcf5aed5575231afc688eb83d 100644 (file)
--- a/config/etc/fstab
+++ b/config/etc/fstab
@@ -10,4 +10,4 @@ sysfs /sys    sysfs   defaults        0       0
 devpts /dev/pts        devpts   gid=4,mode=620  0     0
 shm    /dev/shm        tmpfs   defaults,size=25%       0       0
 none   /tmp            tmpfs   defaults,size=128M      0       0
-none   /var/log/rrd    tmps    defaults,size=64M       0       0
+none   /var/log/rrd    tmpfs   defaults,size=64M       0       0

diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files
index ea76db77b1ddc534ad7f6f525d27ec57e2bbe76a..ba7ba3409c9574c4470a024cc3998517acae83f3 100644 (file)
--- a/config/rootfiles/updater/filelists/files
+++ b/config/rootfiles/updater/filelists/files
@@ -20,6 +20,7 @@ etc/linuxigd/gatedesc.xml
 usr/local/bin/getiptstate
 usr/local/bin/makegraphs
 usr/local/bin/squidctrl
+usr/local/bin/setddns.pl
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
 srv/web/ipfire/cgi-bin/traffic.cgi
@@ -35,6 +36,7 @@ srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/media.cgi
 srv/web/ipfire/cgi-bin/memory.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/ddns.cgi
 var/ipfire/sensors/
 var/ipfire/graphs.pl
 var/ipfire/firebuild