Merge pull request #333 from shinji-s/adhoc_fix

Avoid gfxboot lockup when booting antiX via syslinux

scripts/distro.py

@@ -222,6 +222,8 @@ def perform_strict_detections(iso_cfg_ext_dir, iso_file_list):
 
     def run_contains(filepath, keyword, cfg_dir=iso_cfg_ext_dir):
         fullpath = os.path.join(cfg_dir, filepath.replace('/', os.sep))
+        if not os.path.exists(fullpath):
+            return False
         try:
             with open(fullpath, 'rb') as f:
                 data = f.read().lower()

scripts/update_cfg_file.py

@@ -138,7 +138,7 @@ def update_distro_cfg_files(iso_link, usb_disk, distro, persistence=0):
     log('Updating distro specific config files...')
 
     tweaker_params = ConfigTweakerParam(
-        _iso_name, install_dir_for_grub,
+        iso_link, install_dir_for_grub,
         persistence, usb_uuid, usb_mount, usb_disk)
     tweaker_class_dict = {
         'ubuntu'         : UbuntuConfigTweaker,
@@ -628,9 +628,11 @@ def update_grub4dos_iso_menu():
             f.write("#end " + iso_basename(config.image_path) + "\n")
 
 class ConfigTweakerParam:
-    def __init__(self, distro_name, distro_path, persistence_size, 
+    # 'iso_link' is also known as 'image_path'
+    def __init__(self, iso_link, distro_path, persistence_size, 
                  usb_uuid, usb_mount, usb_disk):
-        self.distro_name = distro_name
+        self.iso_fname   = os.path.split(iso_link)[1]
+        self.distro_name = os.path.splitext(self.iso_fname)[0]
         assert distro_path[0] == '/'
         self.distro_path = distro_path           # drive relative
         self.persistence_size = persistence_size
@@ -893,9 +895,9 @@ class CentosConfigTweaker(PersistenceConfigTweaker):
                  (add_or_replace_kv(
                      'inst.repo=',
                      'hd:UUID=%s:%s' % (
-                        self.setup_params.usb_uuid,
-                        self.setup_params.distro_path + '/' +
-                        self.setup_params.distro_name + '.iso')),
+                         self.setup_params.usb_uuid,
+                         self.setup_params.distro_path + '/' +
+                         self.setup_params.iso_fname)),
                   starter_is_either('append', 'linux')))
         return ops
 
@@ -923,6 +925,11 @@ class AntixConfigTweaker(NoPersistenceTweaker):
                                     self.setup_params.distro_path)
 
         return [(ops, starter_is_either('append', 'APPEND', 'linux'))]
+    def post_process(self, s):
+        s = re.sub(r'^(\s*UI\s+(.*?gfxboot(\.c32|)))\s+(.*?)\s+(.*)$',
+                   r'# \1 \4.renamed-to-avoid-lockup \5', s,
+                   flags=re.I + re.MULTILINE)
+        return s
 
 
 class SalixConfigTweaker(NoPersistenceTweaker):
@@ -931,9 +938,9 @@ class SalixConfigTweaker(NoPersistenceTweaker):
             return None
         p = self.setup_params
         for replacee, replacer in [
-                ('iso_path', "%s/%s.iso" % (p.distro_path, p.distro_name)),
-                ('initrd=', 'fromiso=%s/%s.iso initrd=' % (
-                    p.distro_path, p.distro_name)),
+                ('iso_path', "%s/%s" % (p.distro_path, p.iso_fname)),
+                ('initrd=', 'fromiso=%s/%s initrd=' % (
+                    p.distro_path, p.iso_fname)),
                 ]:
             content = content.replace(replacee, replacer)
         return content
@@ -948,9 +955,9 @@ class SalixConfigTweaker(NoPersistenceTweaker):
 class WifislaxConfigTweaker(NoPersistenceTweaker):
     def param_operations(self):
         ops = [
-            (add_or_replace_kv('livemedia=','%s:%s/%s.iso' % (
+            (add_or_replace_kv('livemedia=','%s:%s/%s' % (
                 self.setup_params.usb_uuid, self.setup_params.distro_path,
-                self.setup_params.distro_name)),
+                self.setup_params.iso_fname)),
              starter_is_either('append', 'linux'))]
         return ops