"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/luks.cc" between
gparted-1.2.0.tar.gz and gparted-1.3.0.tar.gz

About: GParted is a graphical partition editor for creating, reorganizing, and deleting disk partitions (using GNU libparted).

luks.cc  (gparted-1.2.0):luks.cc  (gparted-1.3.0)
skipping to change at line 19 skipping to change at line 19
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "FileSystem.h" #include "FileSystem.h"
#include "LUKS_Info.h" #include "LUKS_Info.h"
#include "PasswordRAMStore.h"
#include "Utils.h" #include "Utils.h"
#include "luks.h" #include "luks.h"
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include <glibmm/shell.h> #include <glibmm/shell.h>
namespace GParted namespace GParted
{ {
const Glib::ustring & luks::get_custom_text( CUSTOM_TEXT ttype, int index ) cons t const Glib::ustring & luks::get_custom_text( CUSTOM_TEXT ttype, int index ) cons t
skipping to change at line 160 skipping to change at line 161
} }
Glib::ustring size = ""; Glib::ustring size = "";
if ( ! fill_partition ) if ( ! fill_partition )
// Cryptsetup resize takes the size of the encryption mapping, no t the // Cryptsetup resize takes the size of the encryption mapping, no t the
// size of the underlying block device. Both device-mapper and c ryptsetup // size of the underlying block device. Both device-mapper and c ryptsetup
// always work in units of 512 byte sectors regardless of the act ual // always work in units of 512 byte sectors regardless of the act ual
// device sector size. // device sector size.
size = "--size " + Utils::num_to_str( ( partition_new.get_byte_le ngth() - mapping.offset ) / 512LL ) + " "; size = "--size " + Utils::num_to_str( ( partition_new.get_byte_le ngth() - mapping.offset ) / 512LL ) + " ";
return ! execute_command( "cryptsetup -v " + size + "resize " + Glib::she const char *pw = NULL;
ll_quote( mapping.name ), if (mapping.key_loc == KEYLOC_KeyRing)
operationdetail, EXEC_CHECK_STATUS ); pw = PasswordRAMStore::lookup(partition_new.uuid);
return ! execute_command("cryptsetup -v " + size + "resize " + Glib::shel
l_quote(mapping.name),
pw, operationdetail, EXEC_CHECK_STATUS);
} }
} //GParted } //GParted
 End of changes. 2 change blocks. 
3 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)