permissions fixes

bsdfdisk/edit_slice.cgi

@@ -0,0 +1,117 @@
+#!/usr/local/bin/perl
+# Show details of a slice, and partitions on it
+
+use strict;
+use warnings;
+require './bsdfdisk-lib.pl';
+our (%in, %text, $module_name);
+&ReadParse();
+my $extwidth = 300;
+
+# Get the disk and slice
+my @disks = &list_disks_partitions();
+my ($disk) = grep { $_->{'device'} eq $in{'device'} } @disks;
+$disk || &error($text{'disk_egone'});
+my ($slice) = grep { $_->{'number'} eq $in{'slice'} } @{$disk->{'slices'}};
+$slice || &error($text{'slice_egone'});
+
+&ui_print_header($slice->{'desc'}, $text{'slice_title'}, "");
+
+# Show slice details
+print &ui_form_start("save_slice.cgi");
+print &ui_hidden("device", $in{'device'});
+print &ui_hidden("slice", $in{'slice'});
+print &ui_table_start($text{'slice_header'}, undef, 2);
+
+print &ui_table_row($text{'part_device'},
+	"<tt>$slice->{'device'}</tt>");
+
+print &ui_table_row($text{'slice_ssize'},
+	&nice_size($slice->{'size'}));
+
+print &ui_table_row($text{'slice_sstart'},
+	$slice->{'startblock'});
+
+print &ui_table_row($text{'slice_send'},
+	$slice->{'startblock'} + $slice->{'blocks'} - 1);
+
+print &ui_table_row($text{'slice_stype'},
+	&ui_select("type", $slice->{'type'},
+		   [ sort { $a->[1] cmp $b->[1] }
+			  map { [ $_, &fdisk::tag_name($_) ] }
+			      &fdisk::list_tags() ]));
+
+print &ui_table_row($text{'slice_sactive'},
+	$slice->{'active'} ? $text{'yes'} :
+		&ui_yesno_radio("active", $slice->{'active'}));
+
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'save'} ] ]);
+
+# Show partitions table
+my @links = ( "<a href='part_form.cgi?device=".&urlize($disk->{'device'}).
+	      "&slice=$in{'slice'}'>".$text{'slice_add'}."</a>" );
+if (@{$slice->{'parts'}}) {
+	print &ui_links_row(\@links);
+	print &ui_columns_start([
+		$text{'slice_letter'},
+		$text{'slice_type'},
+		$text{'slice_extent'},
+		$text{'slice_size'},
+		$text{'slice_start'},
+		$text{'slice_end'},
+		$text{'slice_use'},
+		]);
+	foreach my $p (@{$slice->{'parts'}}) {
+		# Create images for the extent
+                my $ext = "";
+                $ext .= sprintf "<img src=images/gap.gif height=10 width=%d>",
+                        $extwidth*($p->{'startblock'} - 1) /
+                        $slice->{'blocks'};
+                $ext .= sprintf "<img src=images/%s.gif height=10 width=%d>",
+                        $p->{'extended'} ? "ext" : "use",
+                        $extwidth*($p->{'blocks'}) /
+                        $slice->{'blocks'};
+                $ext .= sprintf "<img src=images/gap.gif height=10 width=%d>",
+                  $extwidth*($slice->{'blocks'} - $p->{'startblock'} -
+			     $p->{'blocks'}) / $slice->{'blocks'};
+
+		# Work out use
+		my @st = &fdisk::device_status($p->{'device'});
+		my $use = &fdisk::device_status_link(@st);
+
+		# Add row for the partition
+		my $url = "edit_part.cgi?device=".&urlize($disk->{'device'}).
+			  "&slice=".$slice->{'number'}."&part=".$p->{'letter'};
+		print &ui_columns_row([
+			"<a href='$url'>".uc($p->{'letter'})."</a>",
+			"<a href='$url'>$p->{'type'}</a>",
+			$ext,
+			&nice_size($p->{'size'}),
+			$p->{'startblock'},
+			$p->{'startblock'} + $p->{'blocks'} - 1,
+			$use,
+			]);
+		}
+	print &ui_columns_end();
+	}
+else {
+	print "<b>$text{'slice_none'}</b><p>\n";
+	}
+print &ui_links_row(\@links);
+
+print &ui_hr();
+print &ui_buttons_start();
+
+# Button to delete slice
+print &ui_buttons_row(
+	'delete_slice.cgi',
+	$text{'slice_delete'},
+	$text{'slice_deletedesc'},
+	&ui_hidden("device", $in{'device'})."\n".
+	&ui_hidden("slice", $in{'slice'}));
+
+print &ui_buttons_end();
+
+&ui_print_footer("edit_disk.cgi?device=$in{'device'}",
+		 $text{'disk_return'});

bsdfdisk/fsck.cgi

@@ -0,0 +1,44 @@
+#!/usr/local/bin/perl
+# Check the filesystem on a partition
+
+use strict;
+use warnings;
+require './bsdfdisk-lib.pl';
+our (%in, %text, $module_name);
+&ReadParse();
+&error_setup($text{'fsck_err'});
+
+# Get the disk and slice
+my @disks = &list_disks_partitions();
+my ($disk) = grep { $_->{'device'} eq $in{'device'} } @disks;
+$disk || &error($text{'disk_egone'});
+my ($slice) = grep { $_->{'number'} eq $in{'slice'} } @{$disk->{'slices'}};
+$slice || &error($text{'slice_egone'});
+my ($part) = grep { $_->{'letter'} eq $in{'part'} } @{$slice->{'parts'}};
+$part || &error($text{'part_egone'});
+
+&ui_print_unbuffered_header($part->{'desc'}, $text{'fsck_title'}, "");
+
+# Do the creation
+print &text('fsck_checking', "<tt>$part->{'device'}</tt>"),"<br>\n";
+print "<pre>\n";
+my $cmd = &get_check_filesystem_command($disk, $slice, $part);
+&additional_log('exec', undef, $cmd);
+my $fh = "CMD";
+&open_execute_command($fh, $cmd, 2);
+while(<$fh>) {
+	print &html_escape($_);
+	}
+close($fh);
+print "</pre>";
+if ($?) {
+	print $text{'fsck_failed'},"<p>\n";
+	}
+else {
+	print $text{'fsck_done'},"<p>\n";
+	}
+&webmin_log("fsck", "part", $part->{'device'}, $part);
+
+&ui_print_footer(
+    "edit_part.cgi?device=$in{'device'}&slice=$in{'slice'}&part=$in{'part'}",
+    $text{'part_return'});

bsdfdisk/part_form.cgi

@@ -0,0 +1,57 @@
+#!/usr/local/bin/perl
+# Show a form for creating a new partition
+
+use strict;
+use warnings;
+require './bsdfdisk-lib.pl';
+our (%in, %text, $module_name);
+&ReadParse();
+
+# Get the disk and slice
+my @disks = &list_disks_partitions();
+my ($disk) = grep { $_->{'device'} eq $in{'device'} } @disks;
+$disk || &error($text{'disk_egone'});
+my ($slice) = grep { $_->{'number'} eq $in{'slice'} } @{$disk->{'slices'}};
+$slice || &error($text{'slice_egone'});
+
+&ui_print_header($slice->{'desc'}, $text{'npart_title'}, "");
+
+print &ui_form_start("create_part.cgi", "post");
+print &ui_hidden("device", $in{'device'});
+print &ui_hidden("slice", $in{'slice'});
+print &ui_table_start($text{'npart_header'}, undef, 2);
+
+# Partition number (first free)
+my %used = map { $_->{'letter'}, $_ } @{$slice->{'parts'}};
+my $l = 'a';
+while($used{$l}) {
+	$l++;
+	}
+print &ui_table_row($text{'npart_letter'},
+	&ui_textbox("letter", $l, 4));
+
+# Slice size in blocks
+print &ui_table_row($text{'npart_diskblocks'},
+	$slice->{'blocks'});
+
+# Start and end blocks (defaults to last part)
+my ($start, $end) = (0, $slice->{'blocks'});
+foreach my $p (sort { $a->{'startblock'} cmp $b->{'startblock'} }
+		    @{$slice->{'parts'}}) {
+	$start = $p->{'startblock'} + $p->{'blocks'} + 1;
+	}
+print &ui_table_row($text{'nslice_start'},
+	&ui_textbox("start", $start, 10));
+print &ui_table_row($text{'nslice_end'},
+	&ui_textbox("end", $end, 10));
+
+# Partition type
+print &ui_table_row($text{'npart_type'},
+	&ui_select("type", '4.2BSD',
+		   [ &list_partition_types() ]));
+
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'create'} ] ]);
+
+&ui_print_footer("edit_slice.cgi?device=$in{'device'}&slice=$in{'slice'}",
+		 $text{'slice_return'});