webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into core115

Browse Source
This commit is contained in:
Arne Fitzenreiter
2017-10-18 21:20:23 +02:00
parent 6c6c1e3f04 bee416e282
commit fcd8ab4c23
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/extrahd/extrahd.pl
View File

@@ -75,7 +75,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";

1
config/rootfiles/oldcore/114/filelists/files
View File

@@ -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

9
html/cgi-bin/extrahd.cgi
View File

@@ -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();