[gparted] Re-assign UFS to be a basic supported file system (!13)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Re-assign UFS to be a basic supported file system (!13)
- Date: Mon, 17 Sep 2018 16:09:24 +0000 (UTC)
commit d3ef32096a4e24bec5633f3d80f9826d9a062d11
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Fri Sep 7 16:41:29 2018 +0100
Re-assign UFS to be a basic supported file system (!13)
There is no prospect of there being ufs-tools on Linux. The was a
project which did release ufs-tools version 0.1 in 2004, but has been
inactive since then.
http://ufs-linux.sourceforge.net/
Copying and moving is now implemented for file systems in the basic
supported category. Also mounting and unmounting of unsupported file
system and reporting their usage while mounted has been added. This is
all the support that GParted has ever implemented for UFS. Therefore
re-assign UFS as a basic supported file system as it looses no
functionality.
Closes !13 - Support copying and moving of unsupported partition content
include/Makefile.am | 1 -
include/Utils.h | 16 ++++++++--------
include/ufs.h | 35 -----------------------------------
po/POTFILES.in | 1 -
src/GParted_Core.cc | 3 +--
src/Makefile.am | 1 -
src/Utils.cc | 5 +----
src/ufs.cc | 38 --------------------------------------
8 files changed, 10 insertions(+), 90 deletions(-)
---
diff --git a/include/Makefile.am b/include/Makefile.am
index 5b21f084..18290bba 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -68,5 +68,4 @@ EXTRA_DIST = \
reiser4.h \
reiserfs.h \
udf.h \
- ufs.h \
xfs.h
diff --git a/include/Utils.h b/include/Utils.h
index c748e7c6..20ab1153 100644
--- a/include/Utils.h
+++ b/include/Utils.h
@@ -89,16 +89,16 @@ enum FSType
FS_REISER4 = 24,
FS_REISERFS = 25,
FS_UDF = 26,
- FS_UFS = 27,
- FS_XFS = 28,
+ FS_XFS = 27,
// Other recognised file system types
- FS_BITLOCKER = 29,
- FS_GRUB2_CORE_IMG = 30,
- FS_ISO9660 = 31,
- FS_LINUX_SWRAID = 32,
- FS_LINUX_SWSUSPEND = 33,
- FS_REFS = 34,
+ FS_BITLOCKER = 28,
+ FS_GRUB2_CORE_IMG = 29,
+ FS_ISO9660 = 30,
+ FS_LINUX_SWRAID = 31,
+ FS_LINUX_SWSUSPEND = 32,
+ FS_REFS = 33,
+ FS_UFS = 34,
FS_ZFS = 35,
// Partition space usage colours
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 154edc2e..f7ede23b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,5 +63,4 @@ src/nilfs2.cc
src/reiser4.cc
src/reiserfs.cc
src/udf.cc
-src/ufs.cc
src/xfs.cc
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index f773c664..4b9d6854 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -52,7 +52,6 @@
#include "hfsplus.h"
#include "reiser4.h"
#include "udf.h"
-#include "ufs.h"
#include <parted/parted.h>
#include <cerrno>
@@ -4180,7 +4179,6 @@ void GParted_Core::init_filesystems()
FILESYSTEM_MAP[FS_REISER4] = new reiser4();
FILESYSTEM_MAP[FS_REISERFS] = new reiserfs();
FILESYSTEM_MAP[FS_UDF] = new udf();
- FILESYSTEM_MAP[FS_UFS] = new ufs();
FILESYSTEM_MAP[FS_XFS] = new xfs();
FILESYSTEM_MAP[FS_BITLOCKER] = NULL;
FILESYSTEM_MAP[FS_GRUB2_CORE_IMG] = NULL;
@@ -4188,6 +4186,7 @@ void GParted_Core::init_filesystems()
FILESYSTEM_MAP[FS_LINUX_SWRAID] = NULL;
FILESYSTEM_MAP[FS_LINUX_SWSUSPEND] = NULL;
FILESYSTEM_MAP[FS_REFS] = NULL;
+ FILESYSTEM_MAP[FS_UFS] = NULL;
FILESYSTEM_MAP[FS_ZFS] = NULL;
}
diff --git a/src/Makefile.am b/src/Makefile.am
index a886bde8..099adbd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,6 @@ gpartedbin_SOURCES = \
reiser4.cc \
reiserfs.cc \
udf.cc \
- ufs.cc \
xfs.cc
gpartedbin_LDADD = $(GTHREAD_LIBS) $(GTKMM_LIBS)
diff --git a/src/Utils.cc b/src/Utils.cc
index 8781ffa2..0d69b104 100644
--- a/src/Utils.cc
+++ b/src/Utils.cc
@@ -115,7 +115,6 @@ Glib::ustring Utils::get_color( FSType filesystem )
case FS_REISER4: return "#887FA3"; // Purple Medium
case FS_REISERFS: return "#ADA7C8"; // Purple Hilight
case FS_UDF: return "#105210"; // Accent Green Shadow [+]
- case FS_UFS: return "#D1940C"; // Accent Yellow Dark
case FS_XFS: return "#EED680"; // Accent Yellow
case FS_BITLOCKER: return "#494066"; // Purple Shadow
case FS_GRUB2_CORE_IMG: return "#666666"; // Dark Gray [*]
@@ -123,6 +122,7 @@ Glib::ustring Utils::get_color( FSType filesystem )
case FS_LINUX_SWRAID: return "#5A4733"; // Dark brown [*]
case FS_LINUX_SWSUSPEND: return "#884631"; // Red Dark
case FS_REFS: return "#2AB98A"; // Medium Aquamarine [*]
+ case FS_UFS: return "#D1940C"; // Accent Yellow Dark
case FS_ZFS: return "#CC763D"; // Darker Orange [*]
case FS_USED: return "#F8F8BA"; // Light Tan Yellow [*]
case FS_UNUSED: return "#FFFFFF"; // White
@@ -237,7 +237,6 @@ int Utils::get_filesystem_label_maxlength( FSType filesystem )
case FS_REISER4 : return 16 ;
case FS_REISERFS : return 16 ;
case FS_UDF : return 126; // and only 63 if label contains character above U+FF
- //case FS_UFS : return ;
case FS_XFS : return 12 ;
default : return 30 ;
@@ -357,7 +356,6 @@ const Glib::ustring Utils::get_filesystem_kernel_name( FSType fstype )
case FS_REISER4 : return "reiser4";
case FS_REISERFS : return "reiserfs";
case FS_UDF : return "udf";
- case FS_UFS : return "ufs";
case FS_XFS : return "xfs";
default : return "";
}
@@ -386,7 +384,6 @@ Glib::ustring Utils::get_filesystem_software( FSType filesystem )
case FS_REISER4 : return "reiser4progs" ;
case FS_REISERFS : return "reiserfsprogs / reiserfs-utils" ;
case FS_UDF : return "udftools";
- case FS_UFS : return "" ;
case FS_XFS : return "xfsprogs, xfsdump" ;
default : return "" ;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
