Merge lp:~oem-solutions-group/usb-creator/support-oem-images into lp:usb-creator

[Cody A.W. Somerville]

[Cody A.W. Somerville (cody-somerville)]

This branch should make usb-creator work with images created by the OEM Image Build System. Not that OEM images are overly alien or anything though, we just simply organize our syslinux configuration files differently. We can get around this by instead of only looking at a set of hardcoded file names look at all the cfg files under the syslinux directory.

This branch also removes the copy of '/syslinux/syslinux.cfg' to '/syslinux.cfg'. I'm pretty sure this is no longer necessary but I'm actually going to build an image and test this right now to double check.

[lp:~oem-solutions-group/usb-creator/support-oem-images]

230. By Cody A.W. Somerville on 2009-10-01

Strip tabs when parsing iso/syslinx config files to correctly identify
commands in a syslinux config file that indents lines.

231. By Cody A.W. Somerville on 2009-10-01

Don't (incorrectly) assume cwd when globbing for syslinux config files.

232. By Cody A.W. Somerville on 2009-10-01

Simplify mangle_syslinux function by removing need to calculate element indexes by appending instead of inserting new boot arguments in the middle of the list. Also, ensure command is always set to the command for the current line (even though the original motiviation, protecting against ValueError x not in list exceptions being thrown when getting index of command in list, is moot now.

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-01 13:30:00 +0000
+++ debian/changelog	2009-10-01 17:00:29 +0000
@@ -1,9 +1,18 @@
 usb-creator (0.2.9) UNRELEASED; urgency=low
-
+  
+  [Evan Dandrea]
   * Properly catch exceptions around modifying the syslinux
     configuration (LP: #439977).
+  
+  [Cody A.W. Somerville]
+  * usbcreator/install.py:
+    - Do not copy /syslinux/syslinux.cfg to root of disk, no longer needed.
+    - Look at all files ending in .cfg under the syslinux directory when
+      updating configuration files based on the options selected in usb-creator.
+    - Strip tabs when parsing iso/syslinx config files to correctly identify
+      commands in a syslinux config file that indents lines.
 
- -- Evan Dandrea <[e-mail]>  Thu, 01 Oct 2009 14:29:35 +0100
+ -- Cody A.W. Somerville <[e-mail]>  Thu, 01 Oct 2009 11:24:14 -0300
 
 usb-creator (0.2.8) karmic; urgency=low
 
 
=== modified file 'usbcreator/install.py'
--- usbcreator/install.py	2009-10-01 13:30:00 +0000
+++ usbcreator/install.py	2009-10-01 17:00:29 +0000
@@ -223,34 +223,32 @@
                    os.path.join(self.target, 'syslinux', 'syslinux.cfg'))
         self.check()
         
-        # Mangle the configuration file based on the options we've selected.
-        for filename in (os.path.join('syslinux', 'syslinux.cfg'),
-                         os.path.join('syslinux', 'adtext.cfg'),
-                         os.path.join('syslinux', 'text.cfg')):
+        # Mangle the configuration files based on the options we've selected.
+        import glob
+        for filename in glob.iglob("%s/syslinux/*.cfg" % self.target):
             f = None
             try:
-                f = open(os.path.join(self.target, filename), 'r')
+                f = open(filename, 'r')
                 label = ''
                 to_write = []
                 for line in f.readlines():
-                    line = line.strip('\n').split(' ')
-                    for l in line:
-                        if l:
-                            command = l
-                            break
-                    if command.lower() == 'append':
-                        pos = line.index(command) + 2
-                        if label not in ('check', 'memtest', 'hd'):
-                            if self.persist != 0:
-                                line.insert(pos, 'persistent')
-                            line.insert(pos, 'cdrom-detect/try-usb=true')
-                        if label not in ('memtest', 'hd'):
-                            line.insert(pos, 'noprompt')
-                    elif command.lower() == 'label':
-                        label = line[1].strip()
-                    to_write.append(' '.join(line) + '\n')
+                    line = line.strip('\n\t').split(' ')
+                    if len(line) and len(line[0]):
+                        command = line[0]
+                        if command.lower() == 'label':
+                            label = line[1].strip()
+                        elif command.lower() == 'append':
+                            if label not in ('check', 'memtest', 'hd'):
+                                if self.persist != 0:
+                                    line.append('persistent')
+                                line.append('cdrom-detect/try-usb=true')
+                            if label not in ('memtest', 'hd'):
+                                line.append('noprompt')
+                        to_write.append(' '.join(line) + '\n')
+                    else:
+                        pass
                 f.close()
-                f = open(os.path.join(self.target, filename), 'w')
+                f = open(filename, 'w')
                 f.writelines(to_write)
             except (KeyboardInterrupt, SystemExit):
                 raise
@@ -262,12 +260,6 @@
                 if f:
                     f.close()
         self.check()
-        
-        # TODO evand 2009-07-23: Test whether present versions of syslinux
-        # still require syslinux.cfg at the root of the filesystem.  This was
-        # supposed to have been fixed.
-        shutil.copy2(os.path.join(self.target, 'syslinux', 'syslinux.cfg'),
-                     os.path.join(self.target, 'syslinux.cfg'))
 
     def create_persistence(self):
         logging.debug('create_persistence')