WIP

src/lib/y2storage/devicegraph.rb

@@ -324,6 +324,10 @@ def blk_devices
       BlkDevice.sorted_by_name(self)
     end
 
+    def encryptions
+      blk_devices.select { |d| d.is?(:encryption) }
+    end
+
     # Find device with given name e.g. /dev/sda3
     # @param [String] name
     # @return [Device, nil] if found Device and if not, then nil
@@ -363,16 +367,7 @@ def find_by_any_name(name)
         return nil
       end
 
-      probed = StorageManager.instance.raw_probed
-      found = BlkDevice.find_by_any_name(probed, name)
-      if found.nil?
-        log.info "Device #{name} not found via system lookup"
-        return nil
-      end
-
-      result = find_device(found.sid)
-      log.info "Result of system lookup for #{name}: #{result.inspect}"
-      result
+      find_in_system(name)
     end
 
     # @return [Array<FreeDiskSpace>]
@@ -559,5 +554,35 @@ def udev_lookup_possible?
       # called provides a seasonable result.
       !StorageManager.instance.committed?
     end
+
+    def find_in_system(device_name)
+      names = alternative_names(device_name).prepend(device_name)
+
+      find_by_alternative_names(names)
+    end
+
+    def find_by_alternative_names(names)
+      probed = StorageManager.instance.raw_probed
+      device = nil
+
+      names.each do |name|
+        device = BlkDevice.find_by_any_name(probed, name)
+        break if device
+
+        log.info "Device #{name} not found via system lookup"
+      end
+
+      return nil unless device
+
+      device = find_device(device.sid)
+      log.info "Result of system lookup: #{device.inspect}"
+      device
+    end
+
+    def alternative_names(device_name)
+      devices = encryptions.select { |e| e.crypttab_name? && device_name.match?(e.crypttab_name) }
+
+      devices.map { |d| device_name.sub(d.crypttab_name, d.dm_table_name) }
+    end
   end
 end

src/lib/y2storage/encryption.rb

@@ -102,6 +102,18 @@ def auto_dm_name=(value)
       save_userdata(:auto_dm_name, value)
     end
 
+    def crypttab_name?
+      !crypttab_name.nil?
+    end
+
+    def crypttab_name
+      userdata_value(:crypttab_name)
+    end
+
+    def crypttab_name=(value)
+      save_userdata(:crypttab_name, value)
+    end
+
   protected
 
     def types_for_is
@@ -168,31 +180,23 @@ def dm_name_for(device)
       #
       # @param devicegraph [Devicegraph]
       # @param crypttab [Crypttab, String] Crypttab object or path to a crypttab file
-      def use_crypttab_names(devicegraph, crypttab)
+      def save_crypttab_names(devicegraph, crypttab)
         crypttab = Crypttab.new(crypttab) if crypttab.is_a?(String)
 
-        assign_crypttab_names(devicegraph, crypttab)
+        crypttab.entries.each { |e| save_crypttab_name(devicegraph, e) }
       end
 
     private
 
-      # Sets the crypttab names according to the values indicated in a crypttab file
-      #
-      # @param devicegraph [Devicegraph]
-      # @param crypttab [Crypttab]
-      def assign_crypttab_names(devicegraph, crypttab)
-        crypttab.entries.each { |e| assign_crypttab_name(devicegraph, e) }
-      end
-
       # Sets the crypttab name according to the value indicated in a crypttab entry
       #
       # @param devicegraph [Devicegraph]
       # @param entry [SimpleEtcCrypttabEntry]
-      def assign_crypttab_name(devicegraph, entry)
+      def save_crypttab_name(devicegraph, entry)
         device = entry.find_device(devicegraph)
         return unless device && device.encrypted?
 
-        device.encryption.dm_table_name = entry.name
+        device.encryption.crypttab_name = entry.name
       end
 
       # Checks whether a given DeviceMapper table name is already in use by some

src/lib/y2storage/simple_etc_crypttab_entry.rb

@@ -58,7 +58,8 @@ class SimpleEtcCrypttabEntry
     # @param devicegraph [Devicegraph]
     # @return [BlkDevice, nil] nil if the device is not found
     def find_device(devicegraph)
-      devicegraph.find_by_any_name(device)
+      device = devicegraph.find_by_any_name(self.device)
+      device && device.is?(:encryption) ? device.blk_device : device
     end
   end
 end

test/y2storage/encryption_test.rb

@@ -32,7 +32,7 @@
 
   let(:devicegraph) { Y2Storage::StorageManager.instance.staging }
 
-  describe ".use_crypttab_names" do
+  xdescribe ".use_crypttab_names" do
     before do
       allow(Storage).to receive(:read_simple_etc_crypttab).and_return(storage_entries)
     end