← Back to branch summary

~usb-creator-hackers/usb-creator/trunk

« back to all changes in this revision

Viewing changes to usbcreator/install.py

  • Committer: Yu Ning
  • Date: 2015-02-25 07:49:21 UTC
  • mto: This revision was merged to the branch mainline in revision 467.
  • Revision ID: ning.yu@canonical.com-20150225074921-2s0aklzgdgn19ape
Mount the squashfs from the usbstick instead of the CDROM/ISO, so we don't need to break the API compability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
usbcreator/install.py
66
66
class install(Thread):
67
67
    def __init__(self, source, target, persist, device=None,
68
68
                 allow_system_internal=False,
69
 
                 fastboot_mode=False,
70
 
                 sourcefs=''):
 
69
                 fastboot_mode=False):
71
70
        Thread.__init__(self)
72
71
        self.source = source
73
72
        self.target = target
75
74
        self.device = device
76
75
        self.allow_system_internal = allow_system_internal
77
76
        self.fastboot_mode = fastboot_mode
78
 
        self.sourcefs = sourcefs
79
77
        self._stopevent = Event()
80
78
        self.progress_thread = None
81
79
        logging.debug('install thread source: %s' % source)
251
249
                obj.InstallBootloader(self.device, self.allow_system_internal,
252
250
                                      grub_location,
253
251
                                      self.need_syslinux_legacy(),
254
 
                                      self.sourcefs,
255
252
                                      dbus_interface='com.ubuntu.USBCreator',
256
253
                                      timeout=MAX_DBUS_TIMEOUT)
257
254
            except dbus.DBusException: