Merge branch 'master' into core115

diff --combined config/extrahd/extrahd.pl
index 6c3c99c905a657b42a4ffb7800ad8844ab77e638,3c6fa028050d6b879cea2130cd4e2b7e55af00e8..3b57e92303ea13d1c74e92d391ce20333b9cb18e
--- 1/config/extrahd/extrahd.pl
--- 2/config/extrahd/extrahd.pl
+++ b/config/extrahd/extrahd.pl
@@@ -48,6 -48,8 +48,6 @@@ close FILE
  ############################################################################################################################
  ############################################################################################################################
  
 -print "$ARGV[0] $ARGV[1]";
 -
  if ( "$ARGV[0]" eq "mount" ) {
        system("/bin/cp -f /etc/fstab $fstab");
  
@@@ -75,7 -77,7 +75,7 @@@
        if ( ! `/bin/mount | /bin/fgrep $ARGV[1]` ) {
                system("/bin/cp -f /etc/fstab $fstab");
                system("/bin/fgrep -v $ARGV[1] <$fstab >/etc/fstab");
-               print "Succesfully umounted $ARGV[1].\n";
+               print "Successfully umounted $ARGV[1].\n";
                exit(0);
        } else {
                print "Can't umount $ARGV[1].\n";

diff --combined config/rootfiles/oldcore/114/filelists/files
index ca8087f3ea7e16f7a641d3fe2d82224d93e6faf3,3d0cd04a0ab716706e495da4967cce71a6ec8d13..3d0cd04a0ab716706e495da4967cce71a6ec8d13
--- 1/config/rootfiles/oldcore/114/filelists/files
--- 2/config/rootfiles/core/114/filelists/files
+++ b/config/rootfiles/oldcore/114/filelists/files
@@@ -1,4 -1,5 +1,5 @@@
  etc/system-release
  etc/issue
  etc/rc.d/init.d/unbound
+ srv/web/ipfire/cgi-bin/extrahd.cgi
  var/ipfire/langs