summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-03-18 17:27:10 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-03-20 17:13:50 +0100
commitb152ff51997fd8df4ebd44bfdbe2e08ff98a9b3a (patch)
treea029ff151200f946a29d058434e1c1d260f99836 /perl-install
parent67da4ef5c862576e046ab4d813de17628adfa6c4 (diff)
downloaddrakx-b152ff51997fd8df4ebd44bfdbe2e08ff98a9b3a.tar
drakx-b152ff51997fd8df4ebd44bfdbe2e08ff98a9b3a.tar.gz
drakx-b152ff51997fd8df4ebd44bfdbe2e08ff98a9b3a.tar.bz2
drakx-b152ff51997fd8df4ebd44bfdbe2e08ff98a9b3a.tar.xz
drakx-b152ff51997fd8df4ebd44bfdbe2e08ff98a9b3a.zip
add minimal support for exFAT
colorize it the same way as FAT or NTFS
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/fs/format.pm1
-rw-r--r--perl-install/fs/type.pm3
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/share/list.xml1
-rw-r--r--perl-install/share/diskdrake.css6
7 files changed, 12 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ef463eb0d..2484413c6 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+ o add minimal support for exFAT
- remove no more existing modules from various/crypto
(so that rescue system display less "module xxx not found")
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 601ed95b0..f61801d53 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -391,7 +391,7 @@ sub create_buttons4partitions {
if (isLUKS($entry) || isRawLUKS($entry)) {
$w->set_image(gtknew("Image", file => "security-strong"));
}
- my @colorized_fs_types = qw(ext3 ext4 xfs swap vfat ntfs ntfs-3g);
+ my @colorized_fs_types = qw(ext3 ext4 xfs swap vfat ntfs ntfs-3g exfat);
$w->set_name("PART_" . (isEmpty($entry) ? 'empty' :
$entry->{fs_type} && member($entry->{fs_type}, @colorized_fs_types) ? $entry->{fs_type} :
'other'));
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 039352928..a7c5e49a6 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -25,6 +25,7 @@ For each filesystem, list: [ package_name, command_to_use, options_to_use ]
=cut
my %cmds = (
+ exfat => [ 'exfat-utils', 'mkfs.exfat' ],
ext2 => [ 'e2fsprogs', 'mkfs.ext2', '-F' ],
ext3 => [ 'e2fsprogs', 'mkfs.ext3', '-F' ],
ext4 => [ 'e2fsprogs', 'mkfs.ext4', '-F' ],
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 83ca26ddc..fd62dcb6c 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -43,6 +43,7 @@ if_(arch() =~ /i.86|x86_64/,
0x0b => 'vfat', 'FAT32',
0x07 => 'ntfs-3g', 'NTFS-3G',
0x07 => 'ntfs', 'NTFS',
+ 0x07 => 'exfat', 'exFAT',
),
],
@@ -353,7 +354,7 @@ Is it another OS that linux can access its filesystem
=cut
-sub isOtherAvailableFS { isESP($_[0]) || isFat_or_NTFS($_[0]) || member($_[0]{fs_type}, 'ufs', 'hfs', 'iso9660', 'nilfs2') }
+sub isOtherAvailableFS { isESP($_[0]) || isFat_or_NTFS($_[0]) || member($_[0]{fs_type}, 'ufs', 'hfs', 'iso9660', 'nilfs2', 'exfat') }
sub isMountableRW { (isTrueFS($_[0]) || isOtherAvailableFS($_[0])) && $_[0]{fs_type} ne 'ntfs' }
sub cannotBeMountable {
my ($part) = @_;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9585858f1..b4bfe96f9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- install dmsetup when encrypting "/" (thus workarounding unbootable minimal
system as dracut's crypt module depends on it)
+- partitioning:
+ o add minimal support for exFAT
Version 18.25 - 18 March 2020
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 733ea7154..9ff25dccc 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -34,6 +34,7 @@
mkdosfs dosfslabel mlabel
mkntfs ntfsresize ntfslabel
+ <!-- mkfs.exfat - exfat-utils is in tainted/release -->
dmraid kpartx
quotacheck
cryptsetup dmsetup
diff --git a/perl-install/share/diskdrake.css b/perl-install/share/diskdrake.css
index fe5555140..0cb04a238 100644
--- a/perl-install/share/diskdrake.css
+++ b/perl-install/share/diskdrake.css
@@ -45,16 +45,16 @@
padding: 1px;
}
-#PART_vfat, #PART_ntfs, #PART_ntfs-3g {
+#PART_vfat, #PART_ntfs, #PART_ntfs-3g, #PART_exfat {
background-color: #00b7ff;
background-image: none;
padding: 1px;
}
-#PART_vfat:hover, #PART_ntfs:hover, #PART_ntfs-3g:hover {
+#PART_vfat:hover, #PART_ntfs:hover, #PART_ntfs-3g:hover, #PART_exfat:hover {
background-color: #0099e6;
padding: 1px;
}
-#PART_vfat:active, #PART_ntfs:active, #PART_ntfs-3g:active {
+#PART_vfat:active, #PART_ntfs:active, #PART_ntfs-3g:active, #PART_exfat:active {
background-color: #0099e6;
padding: 1px;
}