Permalink
Browse files

Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=112. Th…

…anks to Juan Jesus Ojeda Croissier <juanje.ojeda@gmail.com>.
  • Loading branch information...
1 parent 1f6c16b commit e994f8fc26f24a80361b048ebe07c207b084a180 Mitsutaka Amano committed Nov 27, 2008
Showing with 11 additions and 3 deletions.
  1. +2 −1 debian/changelog
  2. +8 −2 gui/gui.py
  3. +1 −0 moblin-image-creator.spec
View
@@ -25,8 +25,9 @@ moblin-image-creator (0.48) gaston; urgency=low
* Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=130
* Following Prajwal's changelog.
* Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=135 for apt platform. Thanks to Juan Jesus Ojeda Croissier <juanje.ojeda@gmail.com>.
+ * Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=112. Thanks to Juan Jesus Ojeda Croissier <juanje.ojeda@gmail.com>
- -- Mitsutaka Amano <mamano@miraclelinux.com> Thu, 27 Nov 2008 21:41:41 +0900
+ -- Mitsutaka Amano <mamano@miraclelinux.com> Thu, 27 Nov 2008 21:46:24 +0900
moblin-image-creator (0.47) gaston; urgency=low
View
@@ -1144,10 +1144,16 @@ def on_launch_vm_clicked(self, widget):
dialog.destroy()
return
# boot the live usb image in KVM in background
+ kvm_dev = os.path.lexists('/dev/kvm')
+ qemu_bin = "qemu"
if mic_cfg.config.get('general', 'package_manager') == 'apt':
- os.popen("kvm -no-acpi -m 512 -hda " + live_img + " -hdb " + paths.LOCALSTATEDIR + "/lib/moblin-image-creator/kvm/mic_vm_share.img -boot c &")
+ if kvm_dev:
+ qemu_bin = "kvm"
elif mic_cfg.config.get('general', 'package_manager') == 'yum':
- os.popen("qemu-kvm -no-acpi -m 512 -hda " + live_img + " -hdb " + paths.LOCALSTATEDIR + "/lib/moblin-image-creator/kvm/mic_vm_share.img -boot c &")
+ if kvm_dev:
+ qemu_bin = "qemu-kvm"
+
+ os.popen(qemu_bin +" -no-acpi -m 512 -hda " + live_img + " -hdb " + paths.LOCALSTATEDIR + "/lib/moblin-image-creator/kvm/mic_vm_share.img -boot c &")
def getImageName(self, default_name = ".img"):
"""Function to query the user for the name of the image file they want
@@ -65,6 +65,7 @@ rm -rf %{buildroot}
- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=130
- Following Prajwal's changelog.
- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=135 for apt platform. Thanks to Juan Jesus Ojeda Croissier <juanje.ojeda@gmail.com>
+- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=112. Thanks to Juan Jesus Ojeda Croissier <juanje.ojeda@gmail.com>
* Wed Nov 26 2008 Prajwal Mohan <prajwal@linux.intel.com>
- Changing fsets

0 comments on commit e994f8f

Please sign in to comment.