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

Create new method make_path_dmraid_compatible 

This method will be used to ensure that the partition path
matches the name that would be created by the dmraid command.
This commit is contained in:
Curtis Gedak 2010-08-17 09:27:44 -06:00
parent cf264a05bb
commit 73e7f85a2f
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/DMRaid.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Curtis Gedak /* Copyright (C) 2009, 2010 Curtis Gedak
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -53,6 +53,7 @@ public:
Glib::ustring get_dmraid_name( const Glib::ustring & dev_path ) ; Glib::ustring get_dmraid_name( const Glib::ustring & dev_path ) ;
int get_partition_number( const Glib::ustring & partition_name ) ; int get_partition_number( const Glib::ustring & partition_name ) ;
Glib::ustring get_udev_name( const Glib::ustring & dev_path ) ; Glib::ustring get_udev_name( const Glib::ustring & dev_path ) ;
Glib::ustring make_path_dmraid_compatible( Glib::ustring partition_path ) ;
bool create_dev_map_entries( const Partition & partition, OperationDetail & operationdetail ) ; bool create_dev_map_entries( const Partition & partition, OperationDetail & operationdetail ) ;
bool create_dev_map_entries( const Glib::ustring & dev_path ) ; bool create_dev_map_entries( const Glib::ustring & dev_path ) ;
bool delete_affected_dev_map_entries( const Partition & partition, OperationDetail & operationdetail ) ; bool delete_affected_dev_map_entries( const Partition & partition, OperationDetail & operationdetail ) ;

40
src/DMRaid.cc
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Curtis Gedak /* Copyright (C) 2009, 2010 Curtis Gedak
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -254,6 +254,44 @@ Glib::ustring DMRaid::get_udev_name( const Glib::ustring & dev_path )
return udev_name ; return udev_name ;
} }
Glib::ustring DMRaid::make_path_dmraid_compatible( Glib::ustring partition_path )
{
//The purpose of this method is to ensure that the partition name matches
// the name that the dmraid command would create.
//
//From my experience, the general rule of thumb naming convention for creating
// partition names is as follows:
//
// A) If the device name ends in a number, then append the letter "p" and
// the partition number to create the partition name.
// For Example:
// Device Name : /dev/mapper/isw_cjbdddajhi_Disk0
// Partition Name: /dev/mapper/isw_cjbdddajhi_Disk0p1
//
// B) If the device name does not end in a number, then append the
// partition number only to create the partition name.
// For Example:
// Device Name : /dev/mapper/isw_cjbdddajhi_Volume
// Partition Name: /dev/mapper/isw_cjbdddajhi_Volume1
//
//The dmraid command appears to never add the "p" into the partition name.
// Instead in all cases dmraid simply appends the partition number to the
// device name to create a partition name.
//
for ( unsigned int k=0; k < dmraid_devices .size(); k++ )
{
Glib::ustring reg_exp = DEV_MAP_PATH + dmraid_devices[ k ] + "p([0-9]+)" ;
Glib::ustring partition_number = Utils::regexp_label( partition_path, reg_exp ) ;
if ( ! partition_number .empty() )
{
partition_path = DEV_MAP_PATH + dmraid_devices[ k ] + partition_number ;
break ;
}
}
return partition_path ;
}
bool DMRaid::create_dev_map_entries( const Partition & partition, OperationDetail & operationdetail ) bool DMRaid::create_dev_map_entries( const Partition & partition, OperationDetail & operationdetail )
{ {
//Create all missing dev mapper entries for a specified device. //Create all missing dev mapper entries for a specified device.