osinstall: Allow overriding the default icon in OSes

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

src/main.py

@@ -417,7 +417,7 @@ def do_install(self, total_size=None):
             pkg.close()
             self.osins.firmware_package = pkg
 
-        self.osins.install(self.ins.boot_obj_path)
+        self.osins.install(self.ins)
 
         for i in self.osins.idata_targets:
             self.ins.collect_installer_data(i)

src/osinstall.py

@@ -95,10 +95,14 @@ def partition_disk(self, prev, total_size=None):
 
             prev = info.name
 
-    def install(self, boot_obj_path):
+    def install(self, stub_ins):
         p_progress("Installing OS...")
         logging.info("OSInstaller.install()")
 
+        icon = self.template.get("icon", None)
+        if icon:
+            self.extract_file(icon, stub_ins.icon_path)
+
         for part, info in zip(self.template["partitions"], self.part_info):
             logging.info(f"Installing partition {part!r} -> {info.name}")
             image = part.get("image", None)
@@ -151,6 +155,6 @@ def install(self, boot_obj_path):
         for i in m1n1_vars:
             logging.info(f"  {i}")
 
-        m1n1.build(os.path.join("boot", boot_object), boot_obj_path, m1n1_vars)
+        m1n1.build(os.path.join("boot", boot_object), stub_ins.boot_obj_path, m1n1_vars)
 
-        logging.info(f"Built boot object at {boot_obj_path}")
+        logging.info(f"Built boot object at {stub_ins.boot_obj_path}")

src/stub.py

@@ -114,6 +114,7 @@ def get_paths(self):
         self.core_services = os.path.join(self.osi.system, "System/Library/CoreServices")
         self.sv_path = os.path.join(self.core_services, "SystemVersion.plist")
         self.sv_dis_path = os.path.join(self.core_services, "SystemVersion-disabled.plist")
+        self.icon_path = os.path.join(self.osi.system, ".VolumeIcon.icns")
 
     def check_existing_install(self, osi):
         self.osi = osi
@@ -194,7 +195,7 @@ def install_files(self, cur_os):
         logging.info("Setting up System volume")
 
         self.extract("usr/standalone/bootcaches.plist", self.osi.system)
-        shutil.copy("logo.icns", os.path.join(self.osi.system, ".VolumeIcon.icns"))
+        shutil.copy("logo.icns", self.icon_path)
 
         cs = os.path.join(self.osi.system, "System/Library/CoreServices")
         os.makedirs(cs, exist_ok=True)