partition_alignment removed

yast · Nov 16, 2017 · 9abfb36 · 9abfb36
1 parent 037e8b6
commit 9abfb36
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 29 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,7 +1,10 @@
 -------------------------------------------------------------------
 Tue Nov 14 13:38:44 CET 2017 - schubi@suse.de
 
-- Source cleanup.
+- Code cleanup (removing old libstorag code).
+- Adapting rules to storage-ng.
+- partition_alignment removed because it is not needed
+  anymore by storage-ng.
 - 4.0.7
 
 -------------------------------------------------------------------

diff --git a/src/autoyast-rnc/general.rnc b/src/autoyast-rnc/general.rnc
@@ -26,7 +26,6 @@ general = element general {
         element proposal { text }*
     }? &
     element storage {
-        element partition_alignment { SYMBOL }? &
         element start_multipath { BOOLEAN }? &
         # FATE#317775: support for arbitraty Btrfs subvolume structure
         element btrfs_set_default_subvolume_name { BOOLEAN }?

diff --git a/src/modules/AutoinstClone.rb b/src/modules/AutoinstClone.rb
@@ -70,11 +70,8 @@ def General
         "import_gpg_key"               => true,
         "accept_non_trusted_gpg_key"   => true
       }
-# storage-ng
-      log.error("FIXME : Missing storage call")
       general["storage"] = {
-        "start_multipath" => multipath_in_use?,
-        "partition_alignment" => "" # Storage.GetPartitionAlignment
+        "start_multipath" => multipath_in_use?
       }
 
       Mode.SetMode("autoinst_config")

diff --git a/src/modules/AutoinstGeneral.rb b/src/modules/AutoinstGeneral.rb
@@ -456,15 +456,12 @@ def Write
       AutoinstConfig.RebootMsg = Ops.get_boolean(@mode, "rebootmsg", false)
       AutoinstConfig.setProposalList(@proposals)
 
-      # see bug #597723. Some machines can't boot with the new alignment that parted uses
-      # `align_cylinder == old behavior
-      # `align_optimal  == new behavior
-      if @storage.has_key?("partition_alignment")
-        val = @storage.fetch("partition_alignment",:align_optimal)
-# storage-ng
-         log.error("FIXME : Missing storage call")
-#        Storage.SetPartitionAlignment(val)
-        Builtins.y2milestone( "alignment set to %1", val )
+      if @storage["partition_alignment"] == :align_cylinder
+        # This option has been set by the user manually in the AY configuration file
+        # (Not via clone_system)
+        # It is not supported anymore with storage-ng. So the user should remove
+        # this option.
+        Popup.Warning(_("The AutoYaST option <partition_alignment> is not supported anymore."))
       end
 
       AutoinstStorage.set_multipathing

diff --git a/test/AutoinstGeneral_test.rb b/test/AutoinstGeneral_test.rb
@@ -78,14 +78,6 @@
     context "when btrfs default subvolume name is not set" do
       it "uses the default name"
     end
-
-    context "when partitiong alignment is defined" do
-      let(:profile) do
-        { "storage" => { "partition_alignment" => "align_optimal" } }
-      end
-
-      it "sets partitiong alignment"
-    end
   end
 
   describe "#Export" do

diff --git a/test/autoinst_storage_test.rb b/test/autoinst_storage_test.rb
@@ -193,11 +193,5 @@
     context "when btrfs default subvolume name is not set" do
       it "uses the default name"
     end
-
-    context "when partitiong alignment is defined" do
-      let(:profile) { { "partition_alignment" => "align_optimal" } }
-
-      it "sets partitiong alignment"
-    end
   end
 end