Fixed partition type for linux-swap(new).

svn path=/trunk/; revision=1045
This commit is contained in:
Curtis Gedak 2009-01-28 17:48:40 +00:00
parent cc40bbbaad
commit 0375182e3c
2 changed files with 12 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2009-01-28 Curtis Gedak <gedakc@gmail.com>
* src/GParted_Core.cc: Fixed partition type for linux-swap(new).
- Related to GParted bug #419515
2009-01-24 Curtis Gedak <gedakc@gmail.com> 2009-01-24 Curtis Gedak <gedakc@gmail.com>
* gparted.desktop.in.in: Added additional Filesystem category. * gparted.desktop.in.in: Added additional Filesystem category.
@ -5,7 +10,7 @@
* src/Dialog_Partition_Copy.cc, * src/Dialog_Partition_Copy.cc,
src/Win_GParted.cc: Enhanced copy/paste checks when MBR/EBR involved. src/Win_GParted.cc: Enhanced copy/paste checks when MBR/EBR involved.
- Closes GParted bug #567402 - Related to GParted bug #567402
2009-01-20 Curtis Gedak <gedakc@gmail.com> 2009-01-20 Curtis Gedak <gedakc@gmail.com>

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Bart Hakvoort /* Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Bart Hakvoort
* *
* 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
@ -1967,7 +1967,12 @@ bool GParted_Core::set_partition_type( const Partition & partition, OperationDet
PedFileSystemType * fs_type = PedFileSystemType * fs_type =
ped_file_system_type_get( Utils::get_filesystem_string( partition .filesystem ) .c_str() ) ; ped_file_system_type_get( Utils::get_filesystem_string( partition .filesystem ) .c_str() ) ;
//If not found, and FS is linux-swap, then try linux-swap(new)
if ( ! fs_type && Utils::get_filesystem_string( partition .filesystem ) == "linux-swap" )
fs_type = ped_file_system_type_get( "linux-swap(new)" ) ;
//default is Linux (83) //default is Linux (83)
//FIXME: Currently HFS+ and HFS get set to 83, but should be AF.
if ( ! fs_type ) if ( ! fs_type )
fs_type = ped_file_system_type_get( "ext2" ) ; fs_type = ped_file_system_type_get( "ext2" ) ;