Add support for `gpart` in BSD Fdisk #2405

iliaross · 2025-02-13T18:24:06Z

Hello Jamie,

As described in this comment, a user suggests that the changes made are tested and working correctly.

I have reviewed the changes and fixed a large number of broken indents, along with some logic that, from my perspective, was incorrect.

I will add comments along the way, inviting the original author, @karmantyu, to comment on them.

#2364 (comment)

iliaross · 2025-02-13T18:37:14Z

bsdfdisk/bsdfdisk-lib.pl

+# Iterate over disk devices
+foreach my $dev (glob("/dev/ada[0-9]"), glob("/dev/ada[0-9][0-9]"),
+		 glob("/dev/ad[0-9]"), glob("/dev/ad[0-9][0-9]"),
+		 glob("/dev/nvd[0-9]"), glob("/dev/nvd[0-9][0-9]"),


@karmantyu, I have modified it to nvd[0-9][0-9] for all three regexes because nvd[0-9]* is greedy and would even match nvd alone. Will this work for your case? If you are unsure, could you provide the list of devices?

99 disk is plenty enough

iliaross · 2025-02-13T18:38:49Z

bsdfdisk/bsdfdisk-lib.pl

+	# Get size and slices
+	my $out;
+	my $sdev = 's';
+	if (&has_command('gpart')) {


@karmantyu, I changed this part because we want to support older systems that still use fdisk.

I've got the suggestion to implement:

# Add at the beginning of each CGI script sub get_disk_manager { my $has_gpart = &has_command("gpart"); return $has_gpart ? "gpart" : "fdisk"; } # Example implementation for disk operations sub handle_disk_operation { my ($disk, $operation) = @_; my $manager = &get_disk_manager(); if ($manager eq "gpart") { # Modern gpart commands return &execute_gpart_command($disk, $operation); } else { # Legacy fdisk commands return &execute_fdisk_command($disk, $operation); } }

iliaross · 2025-02-13T18:39:36Z

bsdfdisk/bsdfdisk-lib.pl

+			$slice = { 'number' => $1,
+				   'device' => $dev."$sdev".$1,
+				   'index' => scalar(@{$disk->{'slices'}}) };
+			if ($slice->{'device'} =~ /^\/dev\/([a-z]+)(\d+)[ps](\d+)/) {


@karmantyu And, the same here, the regex will match both, old and new format.

A possible example for backward compat.
fdisk_compat_example.zip

iliaross · 2025-02-13T18:42:15Z

bsdfdisk/bsdfdisk-lib.pl

+use WebminCore;
+&init_config();
+&foreign_require("mount");
+&foreign_require("fdisk");


@karmantyu, I reverted back this change to use fdisk module, because using mount::device_status seems incorrect, simply because device_status sub isn't available in mount module.

iliaross · 2025-02-13T18:43:20Z

bsdfdisk/create_part.cgi

 # Validate inputs, starting with slice number
 my $part = { };
-$in{'letter'} =~ /^[a-d]$/i || &error($text{'npart_eletter'});
+$in{'letter'} =~ /^[a-z]$/i || &error($text{'npart_eletter'});


@karmantyu, can you explain this change?

iliaross · 2025-02-13T18:44:51Z

bsdfdisk/create_part.cgi

 # Slice type
 $part->{'type'} = $in{'type'};
+# Set partition properties
+$part->{'label'} = $in{'label'} if ($in{'label'} =~ /^[a-zA-Z0-9._-]+$/);


@karmantyu, I have also changed the regex from /^[a-zA-Z0-9._-]*$/ to /^[a-zA-Z0-9._-]+$/ because we expect the label not to be empty.

iliaross · 2025-02-13T18:45:20Z

bsdfdisk/create_slice.cgi


 # Slice type
 $slice->{'type'} = $in{'type'};
+$slice->{'label'} = $in{'label'} if ($in{'label'} =~ /^[a-zA-Z0-9._-]+$/);


@karmantyu, and the same here.

iliaross · 2025-02-13T18:46:21Z

bsdfdisk/edit_disk.cgi

 if ($disk->{'model'}) {
        push(@info, &text('disk_model', $disk->{'model'}));
        }
-push(@info, &text('disk_cylinders', $disk->{'cylinders'}));


@karmantyu, why deleting this line? Please remember we need to provide support for older versions!

iliaross · 2025-02-13T18:51:42Z

bsdfdisk/edit_part.cgi

 		&ui_select("type", $part->{'type'},
 			   [ &list_partition_types() ], 1, 0, 1));
+	print &ui_table_row($text{'part_label'},
+		&ui_textbox("label", $part->{'label'}, 20));


@karmantyu, remember to maintain indent correctly! We use tabs with tab display size set to 8.

iliaross · 2025-02-13T18:54:05Z

bsdfdisk/edit_slice.cgi

-		   [ sort { $a->[1] cmp $b->[1] }
-			  map { [ $_, &fdisk::tag_name($_) ] }
-			      &fdisk::list_tags() ]));
+		   [ &list_partition_types() ]));


@karmantyu, we need to main backward compatibility with older versions of BSD that don't have gpart available.

I folder than FreeBSD 10.0. needed of course.

iliaross · 2025-02-13T18:55:50Z

bsdfdisk/edit_slice.cgi

 	$slice->{'active'} ? $text{'yes'} :
 		&ui_yesno_radio("active", $slice->{'active'}));
+# Label field
+print &ui_table_row($text{'slice_label'},


@karmantyu, where is the updated lang/en file? I couldn't find it in the initial archive, and all these new language strings are missing.

Sorry missed that. Maybe tomorrow.

en.txt

I've let Sourcegraph cross-reference the language file with the changes. Need further testing.

iliaross · 2025-02-13T18:57:13Z

bsdfdisk/part_form.cgi

+# Partition type selection
 print &ui_table_row($text{'npart_type'},
-	&ui_select("type", '4.2BSD',
+	&ui_select("type", 'freebsd-ufs',


@karmantyu, it has to be backward compatible with older versions of BSD.

iliaross · 2025-02-13T18:58:41Z

bsdfdisk/slice_form.cgi

 # Start and end blocks (defaults to last slice+1)
-my ($start, $end) = (63, $disk->{'blocks'});
-foreach my $s (sort { $a->{'startblock'} cmp $b->{'startblock'} }
+my ($start, $end) = (2048, $disk->{'blocks'});


@karmantyu, can you explain this change? Again, it has to be compatible with older versions.

Using newer disk drives, GPT is recommended which uses 2048 as start sector by default. For partitioning newer "Advanced Format 4K" disks.

iliaross · 2025-02-13T18:59:06Z

bsdfdisk/slice_form.cgi

-my ($start, $end) = (63, $disk->{'blocks'});
-foreach my $s (sort { $a->{'startblock'} cmp $b->{'startblock'} }
+my ($start, $end) = (2048, $disk->{'blocks'});
+foreach my $s (sort { $a->{'startblock'} <=> $b->{'startblock'} }


@karmantyu, and why this change?

1 MiB (2048 sector) alignment was introduced to Linux fdisk in util-linux-ng-2.17.1/fdisk/fdisk.c, function update_sector_offset(void), released on 2010-02-22. Windows Vista was released in 2006-11.

And more: In other words, the LBA sector number 63 corresponds to cylinder 0, head 1, sector 1 in the CHS format, which is the first sector you can use in the MBR format. However, the number 63 is not divisible by 8, which causes a problem with 4K drives, so some modern tools starts the first partition at 2048 which also provides future GPT compatibility.

karmantyu · 2025-02-13T19:23:07Z

Appreciate Your hard work. Sorry for the mistakes.

karmantyu · 2025-02-16T15:00:58Z

working_example.zip

New example bsdfdiksk-lib.pl now checking if the BSD is newer than ver. 10 and using gpart in case of new systems. Showing the partitions and slices nicely on FreeBSD 14.2

Add support for gpart in BSD Fdisk

07e9674

#2364 (comment)

iliaross mentioned this pull request Feb 13, 2025

Fdisk support on FreeBSD is deprecated. #2364

Closed

iliaross commented Feb 13, 2025

View reviewed changes

Add support for gpart in BSD Fdisk #2405

Are you sure you want to change the base?

Add support for gpart in BSD Fdisk #2405

Uh oh!

Conversation

iliaross commented Feb 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iliaross Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

karmantyu Feb 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iliaross Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

karmantyu Feb 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iliaross Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

karmantyu commented Feb 13, 2025

Uh oh!

karmantyu commented Feb 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Add support for `gpart` in BSD Fdisk #2405

Add support for `gpart` in BSD Fdisk #2405

iliaross Feb 13, 2025 •

edited

Loading

karmantyu Feb 14, 2025 •

edited

Loading

iliaross Feb 13, 2025 •

edited

Loading

karmantyu Feb 14, 2025 •

edited

Loading

iliaross Feb 13, 2025 •

edited

Loading