Rodrigo Bistolfi avatar Rodrigo Bistolfi committed 9e12c67

Fix bug causing mkinitrd being executed with old fs

Comments (0)

Files changed (2)

vinstall/controller/bootloader.py

     def mkinitrd(self):
         LOG.debug("Creating initrd")
         root = self.config["target_device"]
-        fs = root.query_filesystem()
+        fs = self.config["target_device_fs"]
         try:
             utils.mkinitrd(root.path(), fs)
         except Exception as e:

vinstall/controller/mountpoints.py

         """Save root partition selection for use in other controllers
 
         """
-        root = next(p for p, m in data.items() if m[0] == "/")
+        root, fs = next(p, m[1] for p, m in data.items() if m[0] == "/")
         self.config["target_device"] = root
+        self.config["target_device_fs"] = fs
 
     def mount_target(self, data):
         """Mount target partitions
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.