fixe git merge

yast · Jan 3, 2020 · 9db1181 · 9db1181
1 parent 5506ca5
commit 9db1181
Showing 1 changed file with 7 additions and 22 deletions.
diff --git a/src/modules/RootPart.rb b/src/modules/RootPart.rb
@@ -803,6 +803,13 @@ def mount_specials_in_destdir
         )
       end
 
+      # bind-mount /run into chroot (bsc#1152530)
+      if MountPartition("/run", "/run", "none", "bind").nil?
+        AddMountedPartition(
+          type: "mount", device: "none", mntpt: "/run"
+        )
+      end
+
       efivars_path = "/sys/firmware/efi/efivars"
       if ::File.exist?(efivars_path)
         if MountPartition(efivars_path, "efivarfs", "efivarfs").nil?
@@ -825,28 +832,6 @@ def mount_specials_in_destdir
       end
     end
 
-    def MountFSTab(fstab, _message)
-      fstab = deep_copy(fstab)
-
-      mount_specials_in_destdir
-
-      # bind-mount /run into chroot (bsc#1152530)
-      if MountPartition("/run", "/run", "none", "bind").nil?
-        AddMountedPartition(
-          type: "mount", device: "none", mntpt: "/run"
-        )
-      end
-
-      efivars_path = "/sys/firmware/efi/efivars"
-      if ::File.exist?(efivars_path)
-        if MountPartition(efivars_path, "efivarfs", "efivarfs").nil?
-          AddMountedPartition(
-            type: "mount", device: "efivarfs", mntpt: efivars_path
-          )
-        end
-      end
-    end
-
     def MountFSTab(fstab, _message)
       fstab = deep_copy(fstab)