Changes to use the postinst --esp-part-file flag; postinst fixups removed

fixup_image_for_qemu.py

 #!/usr/bin/env python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Makes changes to mounted Chromium OS image to allow it to run with VMs
 
 This script changes two files within the Chromium OS image to let the image
 work with VMs, particularly QEMU
 
 Currently this script does the following,
 1.) Modify the post install script to remove EFI fixup section; the VM's we
 support don't have EFI support anyway and this section of the script needs
 access to the actual device drives
 
 2.) For QEMU/KVM, we change the xorg.conf to remove mouse support and instead
 change it to complete tablet support. This is done to provide better mouse
 response in the VM since tablets work of absolute coordinates while the mouse
 works of relative. In a screen that doesn't support a mouse grab (e.g., VNC),
 relative coordinates can cause the mouse to be flaky
 
 """
 
 from optparse import OptionParser
 import os
 import stat
 import sys
 
-USAGE = "usage: %prog --mounted_dir=directory --for_qemu=[true]"
-
-POST_INST_IN_FILENAME = 'usr/sbin/chromeos-postinst'
-POST_INST_OUT_FILENAME = 'postinst_vm'
-XORG_CONF_FILENAME = os.path.join('etc', 'X11', 'xorg.conf')
-
-EFI_CODE_MARKER_START = r'echo "Updating grub target for EFI BIOS"'
-EFI_CODE_MARKER_END = \
-    r"""sh "${INSTALL_ROOT}"/usr/sbin/chromeos-firmwareupdate
-  fi
-else"""
+USAGE = "usage: %prog --mounted_dir=directory --enable_tablet=[true]"
 
 INPUT_SECTION_MARKER = r'Section "InputDevice"'
 SECTION_END_MARKER = r'EndSection'
 
 MOUSE_SECTION_IDENTIFIERS = []
 MOUSE_SECTION_IDENTIFIERS += ['Identifier "Mouse']
 MOUSE_SECTION_IDENTIFIERS += ['Identifier "USBMouse']
 
-REPLACE_USB_MOUSE_PAIR = ('InputDevice "USBMouse" "AlwaysCore"',
-                          '')
+REPLACE_USB_MOUSE_PAIR = ('InputDevice "USBMouse" "AlwaysCore"', '')
+XORG_CONF_FILENAME = os.path.join('etc', 'X11', 'xorg.conf')
 
 
 TABLET_DEVICE_CONFIG = """
 Section "InputDevice"
   Identifier  "Mouse1"
   Driver      "evdev"
   Option      "Device" "/dev/input/event2"
   Option      "CorePointer" "true"
 EndSection
 """
@@ skipping 32 matching lines @@
 
   # Replace UsbMouse with Tablet.
   xorg_conf = xorg_conf.replace(REPLACE_USB_MOUSE_PAIR[0],
                                 REPLACE_USB_MOUSE_PAIR[1])
 
   # Write the file back out.
   f = open(xorg_conf_filename, 'w')
   f.write(xorg_conf)
   f.close()
 
-
-# Remove the code that does EFI processing from the postinst script
-def FixPostInst(mount_point):
-  postinst_in = os.path.join(mount_point, POST_INST_IN_FILENAME)
-  f = open(postinst_in, 'r')
-  postinst = f.read()
-  f.close()
-  m1 = postinst.find(EFI_CODE_MARKER_START)
-  m2 = postinst.find(EFI_CODE_MARKER_END)
-  if (m1 == -1) or (m2 == -1) or (m1 > m2):
-    # basic sanity check
-    return
-  m2 += len(EFI_CODE_MARKER_END)
-  postinst = postinst[0:m1] + postinst[m2:]
-
-  # Write the file back out.
-  postinst_out = os.path.join(mount_point, POST_INST_OUT_FILENAME)
-  f = open(postinst_out, 'w')
-  f.write(postinst)
-  f.close()
-
-  # Mark the file read/execute.
-  os.chmod(postinst_out, stat.S_IEXEC | stat.S_IREAD)
-
-
 def main():
   parser = OptionParser(USAGE)
   parser.add_option('--mounted_dir', dest='mounted_dir',
                     help='directory where the Chromium OS image is mounted')
-  parser.add_option('--for_qemu', dest='for_qemu',
+  parser.add_option('--enable_tablet', dest='enable_tablet',
                     default="true",
                     help='fixup image for qemu')
   (options, args) = parser.parse_args()
 
   if not options.mounted_dir:
     parser.error("Please specify the mount point for the Chromium OS image");
-  if options.for_qemu not in ('true', 'false'):
-    parser.error("Please specify either true or false for --for_qemu")
+  if options.enable_tablet not in ('true', 'false'):
+    parser.error("Please specify either true or false for --enable_tablet")
 
-  FixPostInst(options.mounted_dir)
-  if (options.for_qemu == 'true'):
+  if (options.enable_tablet == 'true'):
     FixXorgConf(options.mounted_dir)
 
 
 if __name__ == '__main__':
   main()