Commits

Anonymous committed e3fb252

Fixed grub error and crash when theme package is missing

  • Participants
  • Parent commits edd6b76

Comments (0)

Files changed (3)

File vinstall/backend/partitioning.py

         myconst = parted.Constraint(device = self.disk._device)
         for i in self.disk._disk.getFreeSpaceRegions():
             if i > mypsize:  # partition fits here
-                start_marker = i.start
+                start_marker = max(i.start, 2048)
         print "Creating new partition @ block %s and extending to %s"% (start_marker, mypsize)
         mygeom = parted.Geometry(device = self.disk._device,
                                  start = start_marker,

File vinstall/controller/automatic.py

         installed at last, or for post install required tasks.
 
         """
-        theme = glob.glob("/mnt/SOURCE/packages/xconf/VL_Theme-*.t?z")[0]
+        theme = glob.glob("/mnt/SOURCE/packages/xconf/VL_Theme-*.t?z")
         vlconfig = glob.glob("/mnt/SOURCE/packages/a/vlconfig2-*.t?z")[0]
-        self.installpkg(theme, "/mnt/TARGET")
+        for pkg in theme:
+            self.installpkg(theme, "/mnt/TARGET")
         self.installpkg(vlconfig, "/mnt/TARGET")
 
     def install_kernel(self):

File vinstall/controller/packages.py

         """Run after installing packages
 
         """
-        theme = glob.glob("/mnt/SOURCE/packages/*/VL_Theme-*.t?z")[0]
+        theme = glob.glob("/mnt/SOURCE/packages/*/VL_Theme-*.t?z")
         vlconfig = glob.glob("/mnt/SOURCE/packages/a/vlconfig2-*.t?z")[0]
-        self.installpkg(theme)
+        for pkg in theme:
+            self.installpkg(pkg)
         self.installpkg(vlconfig)
 
     def install_kernel(self):