Rodrigo Bistolfi avatar Rodrigo Bistolfi committed 884b141

Fix import and name clashing

Comments (0)

Files changed (1)

vinstall/controller/bootloader.py

 from vinstall.backend.media import Disk, Partition
 from vinstall.backend import bootloader
 from itertools import chain
-import os
+import os, subprocess
 
 
 class Bootloader(Controller):
         yield self.set_bind_mounts, tuple(), "Mounting pseudo filesystems"
         yield self.install_bootloader, (bootloader, target), "Installing bootloader"
 
-    def install_bootloader(self, bootloader, target):
+    def install_bootloader(self, bloader, target):
         """Install the bootloader
         
         """
-        bootloader = self.bootloaders[bootloader]
+        bloader = self.bootloaders[bloader]
         disk = self.targets[target]
         target = disk.path()
 
-        if bootloader.lower() == "lilo":
+        if bloader.lower() == "lilo":
             bl = bootloader.Lilo(target)
             for system in bootloader.OperatingSystem.all():
                 bl.add_os(system)
-        elif bootloader == "Grub2":
+        elif bloader == "Grub2":
             bl = bootloader.Grub2(target)
         else:
             return
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.