[git.ipfire.org] IPFire 2.x development tree branch, core114, updated. de5862aaab0e73bffe32162de760b0f000d07d8f

[git.ipfire.org] IPFire 2.x development tree branch, core114, updated. de5862aaab0e73bffe32162de760b0f000d07d8f

[git]

[-- Attachment #1: Type: text/plain, Size: 3695 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core114 has been updated
       via  de5862aaab0e73bffe32162de760b0f000d07d8f (commit)
       via  d5f061e9e7401c2f88483a7bbc48344a412fef3b (commit)
      from  2083519a64c82e8b68ef50cace6be56e7003aa3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit de5862aaab0e73bffe32162de760b0f000d07d8f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 2 19:28:59 2017 +0100

    core114: Ship extrahd.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d5f061e9e7401c2f88483a7bbc48344a412fef3b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sun Oct 1 20:43:16 2017 +0200

    Apache 2.4.27 breaks ExtraHD-GUI
    
    Opening 'extrahd.cgi' led to:
    "Response header name 'scanhd idescanhd partitionsCache-control' contains
    invalid characters, aborting request".
    
    https://forum.ipfire.org/viewtopic.php?f=27&t=19550#p111030
    https://forum.ipfire.org/viewtopic.php?f=50&t=19563&sid=575337ac1caf1df492fced01ca6243de#p111048
    https://forum.ipfire.org/viewtopic.php?f=22&t=19563#p111052
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/extrahd/extrahd.pl                 | 2 +-
 config/rootfiles/core/114/filelists/files | 1 +
 html/cgi-bin/extrahd.cgi                  | 9 +++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/extrahd/extrahd.pl b/config/extrahd/extrahd.pl
index 6593ca4..3c6fa02 100644
--- a/config/extrahd/extrahd.pl
+++ b/config/extrahd/extrahd.pl
@@ -77,7 +77,7 @@ if ( "$ARGV[0]" eq "mount" ) {
 	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 --git a/config/rootfiles/core/114/filelists/files b/config/rootfiles/core/114/filelists/files
index ca8087f..3d0cd04 100644
--- a/config/rootfiles/core/114/filelists/files
+++ b/config/rootfiles/core/114/filelists/files
@@ -1,4 +1,5 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/unbound
+srv/web/ipfire/cgi-bin/extrahd.cgi
 var/ipfire/langs
diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index 5a6fbce..da1efb2 100644
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -48,8 +48,13 @@ my $partitionentry = "";
 my $devicefile = "/var/ipfire/extrahd/devices";
 my $scanfile = "/var/ipfire/extrahd/scan";
 my $partitionsfile = "/var/ipfire/extrahd/partitions";
-system("/usr/local/bin/extrahdctrl scanhd ide");
-system("/usr/local/bin/extrahdctrl scanhd partitions");
+
+#workaround to suppress a warning when a variable is used only once
+my @dummy = ( ${Header::colourgreen}, ${Header::colourred} );
+undef (@dummy);
+
+system("/usr/local/bin/extrahdctrl scanhd ide >/dev/null");
+system("/usr/local/bin/extrahdctrl scanhd partitions >/dev/null");
 
 &Header::showhttpheaders();
 


hooks/post-receive
--
IPFire 2.x development tree