LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File 0002-update-jfs-support.patch of Package yast2-storage (Project home:Ledest:test)

From 1ee971db956c54ebdab878809b10000fbbf208ef Mon Sep 17 00:00:00 2001
From: Led <ledest@gmail.com>
Date: Fri, 14 Oct 2016 01:34:46 +0300
Subject: [PATCH 2/2] update jfs support

---
 doc/README.part.info                            | 2 +-
 src/include/partitioning/custom_part_dialogs.rb | 4 ++--
 src/include/partitioning/ep-settings.rb         | 2 +-
 src/modules/FileSystems.rb                      | 4 ++--
 src/modules/Partitions.rb                       | 2 +-
 src/modules/StorageProposal.rb                  | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/README.part.info b/doc/README.part.info
index 5949693..7a84ea0 100644
--- a/doc/README.part.info
+++ b/doc/README.part.info
@@ -91,7 +91,7 @@ PARTITION
 	Example: fsys=reiserfs
 	Description:
 	This entry describes the filesystem type created on this partition.
-	Possible Filesystem types are: reiserfs,ext2,ext3,ext4,btrfs,xfs,vfat,swap
+	Possible Filesystem types are: reiserfs,ext2,ext3,ext4,btrfs,xfs,jfs,vfat,swap
 	If no filesystem type is given for a partition, btrfs is used.
 
 	Keyword: formatopt
diff --git a/src/include/partitioning/custom_part_dialogs.rb b/src/include/partitioning/custom_part_dialogs.rb
index 5cb61a2..1ab782b 100644
--- a/src/include/partitioning/custom_part_dialogs.rb
+++ b/src/include/partitioning/custom_part_dialogs.rb
@@ -1342,14 +1342,14 @@ module Yast
         txt = _(
           "\n" +
             "The file system on the selected partition cannot be extended by YaST2.\n" +
-            "Only fat, ext2, ext3, ext4, xfs and reiserfs allow extending a file system."
+            "Only fat, ext2, ext3, ext4, xfs, jfs and reiserfs allow extending a file system."
         )
       else
         # Popup text
         txt = _(
           "\n" +
             "The file system on the selected logical volume cannot be extended by YaST2.\n" +
-            "Only fat, ext2, ext3, ext4, xfs and reiserfs allow extending a file system."
+            "Only fat, ext2, ext3, ext4, xfs, jfs and reiserfs allow extending a file system."
         )
       end
       if ask
diff --git a/src/include/partitioning/ep-settings.rb b/src/include/partitioning/ep-settings.rb
index e472a8e..b1dd1da 100644
--- a/src/include/partitioning/ep-settings.rb
+++ b/src/include/partitioning/ep-settings.rb
@@ -105,7 +105,7 @@ module Yast
       end
 
       filesystems = Builtins.filter(
-        [:ext2, :ext3, :ext4, :reiserfs, :xfs, :btrfs]
+        [:ext2, :ext3, :ext4, :reiserfs, :xfs, :jfs, :btrfs]
       ) do |fs|
         FileSystems.IsSupported(fs) && !FileSystems.IsUnsupported(fs)
       end
diff --git a/src/modules/FileSystems.rb b/src/modules/FileSystems.rb
index 2bed646..f06d749 100644
--- a/src/modules/FileSystems.rb
+++ b/src/modules/FileSystems.rb
@@ -71,7 +71,7 @@ module Yast
 
 
       # filesystems possible for root volume. used during scan for root volumes.
-      @possible_root_fs = [:ext2, :ext3, :ext4, :btrfs, :reiserfs, :xfs]
+      @possible_root_fs = [:ext2, :ext3, :ext4, :btrfs, :reiserfs, :xfs, :jfs]
       @swap_m_points = ["swap"]
       @tmp_m_points = ["/tmp", "/var/tmp"]
       @default_subvol = "UNDEFINED"
@@ -1991,7 +1991,7 @@ module Yast
 
     def CanDoQuota(part)
       part = deep_copy(part)
-      quota_fs = [:ext2, :ext3, :ext4, :reiserfs, :xfs]
+      quota_fs = [:ext2, :ext3, :ext4, :reiserfs, :xfs, :jfs]
       Builtins.contains(quota_fs, Ops.get_symbol(part, "used_fs", :unknown))
     end
 
diff --git a/src/modules/Partitions.rb b/src/modules/Partitions.rb
index 1b72c7b..b16fa09 100644
--- a/src/modules/Partitions.rb
+++ b/src/modules/Partitions.rb
@@ -165,7 +165,7 @@ module Yast
         tmp = Convert.to_string(SCR.Read(path(".sysconfig.storage.DEFAULT_FS")))
         if tmp == nil ||
             !Builtins.contains(
-              ["ext2", "ext3", "ext4", "reiserfs", "xfs", "btrfs"],
+              ["ext2", "ext3", "ext4", "reiserfs", "xfs", "jfs", "btrfs"],
               Builtins.tolower(tmp)
             )
           tmp = "ext4"
diff --git a/src/modules/StorageProposal.rb b/src/modules/StorageProposal.rb
index 720e367..f3e5635 100644
--- a/src/modules/StorageProposal.rb
+++ b/src/modules/StorageProposal.rb
@@ -6210,6 +6210,7 @@ module Yast
         Item(Id(:btrfs), "BtrFS"),
         Item(Id(:ext4), "Ext4"),
         Item(Id(:xfs), "XFS"),
+        Item(Id(:jfs), "JFS"),
         Item(Id(:reiserfs), "ReiserFS")
       ]
 
-- 
2.10.0