Attachment 8929 Details for Bug 20161 – Patch to indicate the _default_type subroutine can be used outside the partition_table module

Patch to indicate the _default_type subroutine can be used outside the partition_table module

0001-Rename-partition_table-_default_type-to-partition_ta.patch (text/plain), 1.24 KB, created by Martin Whitaker on 2017-02-05 12:25:04 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2017-02-05 12:25:04 CET

Size: 1.24 KB

patch

obsolete

>From c8dd4da90ee788eaafb76e4133c6bab9f024bfe7 Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mageia@martin-whitaker.me.uk>
>Date: Sat, 4 Feb 2017 23:42:51 +0000
>Subject: [PATCH 1/3] Rename partition_table::_default_type to
> partition_table::default_type.
>
>The following patches want to use it outside the partition_table module.
>
>diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
>index 2a226b7..f0cfc0e 100644
>--- a/perl-install/partition_table.pm
>+++ b/perl-install/partition_table.pm
>@@ -244,14 +244,14 @@ sub get_normal_parts_and_holes {
> }
> 
> 
>-=item _default_type($hd)
>+=item default_type($hd)
> 
> Returns the default type of $hd ('gpt' or 'dos' depending on whether we're running under UEFI or
> whether the disk size is too big for a MBR partition table.
> 
> =cut
> 
>-sub _default_type {
>+sub default_type {
>     my ($hd) = @_;
> 
>     # default to GPT on UEFI systems and disks > 2TB
>@@ -273,7 +273,7 @@ sub initialize {
> 
>     my $current = c::get_disk_type($hd->{file});
>     $current = 'dos' if $current eq 'msdos';
>-    my $type = $o_type || $current || _default_type($hd);
>+    my $type = $o_type || $current || default_type($hd);
> 
>     require "partition_table/$type.pm";
>     "partition_table::$type"->initialize($hd);
>-- 
>2.10.2
>

From c8dd4da90ee788eaafb76e4133c6bab9f024bfe7 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 4 Feb 2017 23:42:51 +0000
Subject: [PATCH 1/3] Rename partition_table::_default_type to
 partition_table::default_type.

The following patches want to use it outside the partition_table module.

diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 2a226b7..f0cfc0e 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -244,14 +244,14 @@ sub get_normal_parts_and_holes {
 }
 
 
-=item _default_type($hd)
+=item default_type($hd)
 
 Returns the default type of $hd ('gpt' or 'dos' depending on whether we're running under UEFI or
 whether the disk size is too big for a MBR partition table.
 
 =cut
 
-sub _default_type {
+sub default_type {
     my ($hd) = @_;
 
     # default to GPT on UEFI systems and disks > 2TB
@@ -273,7 +273,7 @@ sub initialize {
 
     my $current = c::get_disk_type($hd->{file});
     $current = 'dos' if $current eq 'msdos';
-    my $type = $o_type || $current || _default_type($hd);
+    my $type = $o_type || $current || default_type($hd);
 
     require "partition_table/$type.pm";
     "partition_table::$type"->initialize($hd);
-- 
2.10.2

Actions: View

Attachments on bug 20161: 8884 | 8885 | 8896 | 8897 | 8929 | 8930 | 8931 | 8932 | 8956 | 8957