Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework align to MiB adjustments to end sector of partition 

Ensure at least 2 sectors for Extended Boot Record (EBR) between end
of logical partition and start of next logical partition.

Ensure at least 34 sectors reserved for backup GUID Partition Table
(GPT) after the end of the last partition.
This commit is contained in:
Curtis Gedak 2012-03-27 13:42:00 -06:00
parent 98884abe9c
commit 1c47c17a47
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/GParted_Core.cc
View File

@ -513,6 +513,11 @@ bool GParted_Core::snap_to_mebibyte( const Device & device, Partition & partitio
} }
} }
//Align end sector
diff = (partition .sector_end + 1) % ( MEBIBYTE / partition .sector_size);
if ( diff )
partition .sector_end -= diff ;
//If this is a logical partition not at end of drive then check to see if space is //If this is a logical partition not at end of drive then check to see if space is
// required for a following logical partition Extended Boot Record // required for a following logical partition Extended Boot Record
if ( partition .type == TYPE_LOGICAL ) if ( partition .type == TYPE_LOGICAL )
@ -525,8 +530,8 @@ bool GParted_Core::snap_to_mebibyte( const Device & device, Partition & partitio
index_extended = t ; index_extended = t ;
} }
//If there is a following logical partition that starts a mebibyte or less //If there is a following logical partition that starts less than 2 sectors from
// from the end of this partition, then reserve a mebibyte for the EBR. // the end of this partition, then reserve at least a mebibyte for the EBR.
if ( index_extended != -1 ) if ( index_extended != -1 )
{ {
for ( unsigned int t = 0; t < device .partitions[ index_extended ] .logicals .size(); t++ ) for ( unsigned int t = 0; t < device .partitions[ index_extended ] .logicals .size(); t++ )
@ -534,28 +539,26 @@ bool GParted_Core::snap_to_mebibyte( const Device & device, Partition & partitio
if ( ( device .partitions[ index_extended ] .logicals[ t ] .type == TYPE_LOGICAL ) if ( ( device .partitions[ index_extended ] .logicals[ t ] .type == TYPE_LOGICAL )
&& ( device .partitions[ index_extended ] .logicals[ t ] .sector_start > partition .sector_end ) && ( device .partitions[ index_extended ] .logicals[ t ] .sector_start > partition .sector_end )
&& ( ( device .partitions[ index_extended ] .logicals[ t ] .sector_start - partition .sector_end ) && ( ( device .partitions[ index_extended ] .logicals[ t ] .sector_start - partition .sector_end )
< ( MEBIBYTE / device .sector_size ) //Unless specifically told otherwise, the Linux kernel considers extended
// boot records to be two sectors long, in order to "leave room for LILO".
< 2
) )
) )
partition .sector_end -= 1 ; partition .sector_end -= ( MEBIBYTE / partition .sector_size ) ;
} }
} }
} }
//If this is a GPT partition table then reserve a mebibyte at the end of the device //If this is a GPT partition table and the partition ends less than 34 sectors
// for the backup partition table // from the end of the device, then reserve at least a mebibyte for the
if ( device .disktype == "gpt" // backup partition table
&& ( ( device .length - partition .sector_end ) <= ( MEBIBYTE / device .sector_size ) ) if ( device .disktype == "gpt"
&& ( ( device .length - partition .sector_end ) < 34 )
) )
{ {
partition .sector_end -= 1 ; partition .sector_end -= ( MEBIBYTE / partition .sector_size ) ;
} }
//Align end sector
diff = (partition .sector_end + 1) % ( MEBIBYTE / partition .sector_size);
if ( diff )
partition .sector_end -= diff ;
return true ; return true ;
} }