From a638e23899551d89fc0e6b02292e0a497d43b880 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Mon, 12 Apr 2010 16:40:47 +0000
Subject: Add initial nilfs2 support

---
 perl-install/NEWS         | 2 +-
 perl-install/fs/format.pm | 3 +++
 perl-install/fs/mount.pm  | 2 +-
 perl-install/fs/type.pm   | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7e93f0f31..32aadd32f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -6,7 +6,7 @@
 - diskdrake:
   o use device label even if it was not changed  (#47456)
   o allow resizing btrfs
-  o allow creating btrfs
+  o allow creating btrfs and nilfs2
 
 Version 13.15 - 17 March 2010
 
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 25b08939b..9caa4f45f 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -25,6 +25,7 @@ my %cmds = (
     ntfs     => [ 'ntfsprogs', 'mkntfs', '--fast' ],
    'ntfs-3g' => [ 'ntfsprogs', 'mkntfs', '--fast' ],
     btrfs    => [ 'btrfs-progs', 'mkfs.btrfs' ],
+    nilfs2   => [ 'nilfs-utils', 'mkfs.nilfs2' ],
 );
 
 my %LABELs = ( #- option, length, handled_by_mount
@@ -42,6 +43,7 @@ my %LABELs = ( #- option, length, handled_by_mount
     ntfs     => [ '-L', 128, 0 ],
    'ntfs-3g' => [ '-L', 128, 0 ],
     btrfs    => [ '-L', 256, 1 ],
+    nilfs2   => [ '-L', 16, 1],
 );
 
 my %edit_LABEL = ( # package, command, option
@@ -61,6 +63,7 @@ my %edit_LABEL = ( # package, command, option
     ntfs     => [ 'ntfsprogs', 'ntfslabel' ],
    'ntfs-3g' => [ 'ntfsprogs', 'ntfslabel' ],
 #    btrfs
+#    nilfs2
 );
 
 sub package_needed_for_partition_type {
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index 2a7701e53..63db0470a 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -35,7 +35,7 @@ sub mount {
     $fs or log::l("not mounting $dev partition"), return;
 
     {
-	my @fs_modules = qw(btrfs ext3 ext4 hfs jfs nfs ntfs romfs reiserfs ufs xfs vfat);
+	my @fs_modules = qw(btrfs ext3 ext4 hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat);
 	my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devfs devpts auto ntfs-3g), @fs_modules);
 
 	push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall;
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 52902d746..ce8f95436 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -123,6 +123,7 @@ if_(arch() !~ /ppc/,
   0x83 => 'reiser4',  'Journalised FS: Reiser4',
  ),
   0x83 => 'btrfs',    'Btrfs',
+  0x83 => 'nilfs2',   'NILFS2',
   0x84 => '',         'OS/2 hidden C: drive',
   0x86 => '',         'NTFS volume set (0x86)',
   0x87 => '',         'NTFS volume set (0x87)',
-- 
cgit v1.2.1