Merge pull request #432 from yast/modern_fde

Support modern `fde-tools`
agama-project · Feb 17, 2023 · a457bfc · a457bfc
2 parents ee5ed27 + 47470dc
commit a457bfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/service/etc/d-installer.yaml b/service/etc/d-installer.yaml
@@ -149,9 +149,9 @@ Tumbleweed:
 ALP:
   software:
     installation_repositories:
-      - url: https://download.opensuse.org/repositories/SUSE:/ALP:/ToTest/images/repo/ALP-0.1-x86_64-Media1/
+      - url: https://download.opensuse.org/repositories/SUSE:/ALP/standard/
         archs: x86_64
-      - url: https://download.opensuse.org/repositories/SUSE:/ALP:/ToTest/images/repo/ALP-0.1-aarch64-Media1/
+      - url: https://download.opensuse.org/repositories/SUSE:/ALP/standard/
         archs: aarch64
     mandatory_patterns:
       - alp_base

diff --git a/service/lib/dinstaller/storage/manager.rb b/service/lib/dinstaller/storage/manager.rb
@@ -188,8 +188,7 @@ def tpm_key?
       end
 
       def tpm_proposal?
-        settings = proposal.calculated_settings
-        settings.encrypt? && !settings.lvm
+        proposal.calculated_settings.encrypt?
       end
 
       def tpm_system?
@@ -201,7 +200,7 @@ def tpm_present?
 
         @tpm_present =
           begin
-            execute_fdectl("tpm-present")
+            Yast::Execute.on_target!("fdectl", "tpm-present")
             logger.info "FDE: TPMv2 detected"
             true
           rescue Cheetah::ExecutionFailed
@@ -215,9 +214,9 @@ def tpm_product?
       end
 
       def prepare_tpm_key
-        keyfile_path = File.join(Yast::Installation.destdir, "root", ".root.keyfile")
-        execute_fdectl(
-          "add-secondary-key", "--keyfile", keyfile_path,
+        keyfile_path = File.join("root", ".root.keyfile")
+        Yast::Execute.on_target!(
+          "fdectl", "add-secondary-key", "--keyfile", keyfile_path,
           stdin:    "#{proposal.calculated_settings.encryption_password}\n",
           recorder: Yast::ReducedRecorder.new(skip: :stdin)
         )
@@ -228,16 +227,6 @@ def prepare_tpm_key
       rescue Cheetah::ExecutionFailed
         false
       end
-
-      def execute_fdectl(*args)
-        # Some subcommands like "tpm-present" should not require a --device argument, but they
-        # currently do. Let's always us until the problem at fdectl is fully fixed.
-        Yast::Execute.locally!("fdectl", "--device", fdectl_device, *args)
-      end
-
-      def fdectl_device
-        Yast::Installation.destdir
-      end
     end
   end
 end