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

extrahd: Add UUID to table.

Browse Source 
Fix blkid without cache does not work as nobody.
This commit is contained in:
Arne Fitzenreiter
2010-12-10 13:29:23 +01:00
parent 15834b6222
commit e528205ed8
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/extrahd/extrahd.pl
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -84,8 +84,11 @@ if ( "$ARGV[0]" eq "mount" ) {
exit(1);
}
} elsif ( "$ARGV[0]" eq "scanhd") {
system("/usr/local/bin/scanhd $ARGV[1]");
} else {
print "Usage: $0 (mount|umount) mountpoint\n";
print "Usage: $0 (mount|umount|scanhd) mountpoint\n";
}
############################################################################################################################

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

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -48,8 +48,8 @@ my $partitionentry = "";
my $devicefile = "/var/ipfire/extrahd/devices";
my $scanfile = "/var/ipfire/extrahd/scan";
my $partitionsfile = "/var/ipfire/extrahd/partitions";
system("/usr/local/bin/scanhd ide");
system("/usr/local/bin/scanhd partitions");
system("/usr/local/bin/extrahdctrl scanhd ide");
system("/usr/local/bin/extrahdctrl scanhd partitions");
&Header::showhttpheaders();
@@ -181,7 +181,7 @@ END
@scanline = split( /\;/, $scanentry );
print <<END
<tr><td colspan="5">&nbsp;
<tr><td align='center'><b>/dev/$scanline[0]</b>
<tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b>
<td align='center' colspan="2">$scanline[1]
END
;
@@ -206,9 +206,11 @@ END
$size = int($partitionline[1] / 1024);
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<tr><td align="center">/dev/$partitionline[0]
<tr><td align="left" colspan=5><b>UUID=$partitionline[2]</b></td></tr>
<tr>
<td align="list">/dev/$partitionline[0]</td>
<td align="center">$Lang::tr{'size'} $size MB
<td align='center'><select name="FS">
<td align="center"><select name="FS">
<option value="auto">auto</option>
<option value="ext3">ext3</option>
<option value="reiserfs">reiserfs</option>

0
html/cgi-bin/pakfire.cgi Executable file → Normal file
View File