michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FreeBSD support, better detection of usable iSCSI size

Browse Source
This commit is contained in:
Jamie Cameron
2012-09-08 11:19:45 -07:00
parent 22f21ca2ac
commit d7539fef2d
5 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iscsi-server/atboot.cgi
View File

@@ -16,6 +16,8 @@ if ($old != 2 && $in{'boot'}) {
"Start or stop the iSCSI server",
"$config{'iscsi_server'} -f $config{'targets_file'}",
"kill `cat $config{'pid_file'}`",
undef,
{ 'fork' => 1 },
);
&webmin_log("atboot");
}

4
iscsi-server/config-freebsd Normal file
View File

@@ -0,0 +1,4 @@
targets_file=/usr/local/etc/iscsi/targets
iscsi_server=/usr/local/bin/iscsi-target
pid_file=/var/run/iscsi-target.pid
init_name=iscsi_target

2
iscsi-server/index.cgi
View File

@@ -6,7 +6,7 @@ use warnings;
require './iscsi-server-lib.pl';
our (%text, %config, $module_name);
&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1);
&ui_print_header(undef, $text{'index_title'}, "", "intro", 1, 1);
my $err = &check_config();
if ($err) {

45
iscsi-server/iscsi-server-lib.pl
View File

@@ -114,9 +114,32 @@ elsif ($o && !$n) {
}
}
elsif (!$o && $n) {
# Add a line
$n->{'line'} = scalar(@$lref);
push(@$lref, $line);
# Add a line. Extents should come before any devices, and devices
# before any targets
my @allsame = &find($conf, $n->{'type'});
my $lastsame = @allsame ? pop(@allsame) : undef;
my $addline = scalar(@$lref);
if ($lastsame) {
# Add after last of the same type
$addline = $lastsame->{'line'}+1;
}
elsif ($n->{'type'} eq 'device') {
# Add before any targets
my $firsttarget = &find($conf, "target");
$addline = $firsttarget->{'line'} if ($addline);
}
elsif ($n->{'type'} eq 'extent') {
# Add before any devices
my $firstdevice = &find($conf, "device");
$addline = $firstdevice->{'line'} if ($addline);
}
$n->{'line'} = $addline;
splice(@$lref, $addline, 0, $line);
foreach my $c (@$conf) {
if ($c->{'line'} >= $addline) {
$c->{'line'}++;
}
}
push(@$conf, $n);
}
&flush_file_lines($config{'targets_file'});
@@ -154,10 +177,10 @@ sub parse_bytes
{
my ($str) = @_;
if ($str =~ /^(\d+)TB/i) {
return $1 * 1024 * 1204 * 1024 * 1024;
return $1 * 1024 * 1024 * 1024 * 1024;
}
elsif ($str =~ /^(\d+)GB/i) {
return $1 * 1204 * 1024 * 1024;
return $1 * 1024 * 1024 * 1024;
}
elsif ($str =~ /^(\d+)MB/i) {
return $1 * 1024 * 1024;
@@ -178,7 +201,10 @@ else {
sub convert_bytes
{
my ($n) = @_;
if ($n % (1024*1024*1024*1024) == 0) {
if ($n == 0) {
return $n;
}
elsif ($n % (1024*1024*1024*1024) == 0) {
return ($n / (1024*1024*1024*1024))."TB";
}
elsif ($n % (1024*1024*1024) == 0) {
@@ -268,17 +294,18 @@ elsif ($type eq "raid") {
my $conf = &raid::get_raidtab();
foreach my $c (@$conf) {
if ($c->{'value'} eq $dev) {
return $c->{'size'}*1024;
return $c->{'size'} * 1024;
}
}
return undef;
}
elsif ($type eq "lvm") {
# LVM volume group
# LVM volume group. Leave 1 MB free, as it seems to be needed for
# some kind of overhead?
foreach my $v (&lvm::list_volume_groups()) {
foreach my $l (&lvm::list_logical_volumes($v->{'name'})) {
if ($l->{'device'} eq $dev) {
return $l->{'size'} * 1024;
return ($l->{'size'} * 1024) - (1024 * 1024);
}
}
}

2
iscsi-server/module.info
View File

@@ -1,5 +1,5 @@
desc=iSCSI Server
category=hardware
os_support=*-linux
os_support=*-linux freebsd
depends=fdisk lvm raid init
longdesc=Share disk devices across the network using the iSCSI protocol.