Commits

Rodrigo Bistolfi committed 9d387c0 Merge

Removed unnecessary checks

vinstall/controller/bootloader.py

Comments (0)

Files changed (3)

vinstall/backend/installmedia.py

         for partition in partitions:
             needs_umount = False
             if not partition.is_mounted():
-                partition.mount(dev_mountpoint)
+                partition.mount(partition.mountpoint)
                 needs_umount = True
             if is_install_media(partition.mountpoint):
                 config = parse_config(partition.mountpoint)

vinstall/backend/media.py

 
     def __init__(self, device_path):
         """Initializes a Media object fro the device path."""
-
-        self.mountpoint = None
+	mntpoint = device_path.split("/")[2] 
+	mntpoint =  "/mnt/" + mntpoint         
+        if not os.path.exists(mntpoint):
+            os.mkdir(mntpoint)
+	self.mountpoint = mntpoint 
         self.device_path = device_path
         if self.is_mounted():
            for line in open("/etc/mtab"):

vinstall/controller/packages.py

         """Run after installing packages
 
         """
-        theme = glob.glob("/mnt/SOURCE/packages/xconf/VL_Theme-*.t?z")[0]
+        theme = glob.glob("/mnt/SOURCE/packages/*/VL_Theme-*.t?z")[0]
         vlconfig = glob.glob("/mnt/SOURCE/packages/a/vlconfig2-*.t?z")[0]
         self.installpkg(theme)
         self.installpkg(vlconfig)
             os.mkdir(mountpoint)
         install_media = self.config["install_media"]
         if install_media.is_iso():
+            if not os.path.exists(install_media.path):
+		print "mount container here"
             utils.mountiso(install_media.path, mountpoint)
         else:
             utils.mount(install_media.path, mountpoint, filesystem="auto")
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.