chore: remove dead code and some typofixes

pardus · Apr 25, 2024 · c7516eb · c7516eb
1 parent 9fd778b
commit c7516eb
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/live-installer/installer.py b/live-installer/installer.py
@@ -428,10 +428,8 @@ def mount_partitions(self):
                                 # Mount subvolumes
                                 partition.subvolumes.sort(key = lambda x : x.mount_as, reverse=False)
                                 for subvolume in partition.subvolumes:
-                                    log(" ------ Mounting btrfs subvolume {} on /target/{}".format(subvolume.name,subvolume.mount_as))
-                                    self.do_mount(partition.path, "/target/{}".format(subvolume.mount_as), fs, "subvol={}".format(subvolume.name),"--mkdir") 
-                            if partition.mount_as != "":
-                                self.do_mount(partition.path, "/target", fs, "subvol=@")
+                                    log(" ------ Mounting btrfs subvolume {} on /target{}".format(subvolume.name,subvolume.mount_as))
+                                    self.do_mount(partition.path, "/target{}".format(subvolume.mount_as), fs, "subvol={}".format(subvolume.name),"--mkdir") 
                     else:
                         self.error_message(
                             "Cannot mount rootfs (type: {}): {}".format(partition.type, partition.path))
@@ -455,7 +453,7 @@ def mount_partitions(self):
                         notOld = True
                         break
                 if not notOld:
-                    self.run("mv /target/{0} {1}/{0}".format(old,target),vital=False)
+                    self.run("mv /target{0} {1}/{0}".format(old,target),vital=False)
 
 
         # Mount the other partitions