This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 7 +++++--
gui/gui.py | 10 ++++++++--
gui/image-creator.glade | 10 +++++-----
moblin-image-creator.spec | 3 +++
platforms/common-apt/initramfs/usb | 35 +++++++++++++++++++++++++++++------
5 files changed, 50 insertions(+), 15 deletions(-)
New commits:
commit 0a12f94def48e4eb9686a4f1604a61627aa1a564
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Nov 27 21:49:23 2008 +0900
Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=182. Thanks
to Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
commit e994f8fc26f24a80361b048ebe07c207b084a180
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Nov 27 21:48:00 2008 +0900
Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=112. Thanks
to Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>.
commit 1f6c16ba57c1c6f7768239d436f3ccad37eea064
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Nov 27 21:45:09 2008 +0900
Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=135 for apt
platform. Thanks to Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 07ec64c..16f01f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,9 +23,12 @@ moblin-image-creator (0.48) gaston; urgency=low
[ Mitsutaka Amano ]
* Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=130
- * Following Prajwal's changelog.
+ * 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 <[EMAIL PROTECTED]>.
+ * Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=112. Thanks
to Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
+ * Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=182. Thanks
to Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 27 Nov 2008 18:24:27 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 27 Nov 2008 21:48:25 +0900
moblin-image-creator (0.47) gaston; urgency=low
diff --git a/gui/gui.py b/gui/gui.py
index 80cbb1a..86c04bb 100644
--- a/gui/gui.py
+++ b/gui/gui.py
@@ -1144,10 +1144,16 @@ class App(object):
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
diff --git a/gui/image-creator.glade b/gui/image-creator.glade
index b4b8db5..470ea47 100644
--- a/gui/image-creator.glade
+++ b/gui/image-creator.glade
@@ -47,7 +47,7 @@
<child>
<widget class="GtkImageMenuItem" id="Add Project Wizard">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Load
Project</property>
+ <property name="tooltip" translatable="yes">Add Project
Wizard</property>
<property name="label" translatable="yes">_Add Project
Wizard</property>
<property name="use_underline">True</property>
<signal name="activate"
handler="on_Add_Project_Wizard_activate"/>
@@ -177,7 +177,7 @@
<child>
<widget class="GtkImageMenuItem" id="MirrorSettings">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear
Rootstraps</property>
+ <property name="tooltip" translatable="yes">Mirror
Settings</property>
<property name="label" translatable="yes">_Mirror
Settings</property>
<property name="use_underline">True</property>
<signal name="activate"
handler="on_MirrorSettings_activate"/>
@@ -198,7 +198,7 @@
<child>
<widget class="GtkImageMenuItem" id="fsetsInfo">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear
Rootstraps</property>
+ <property name="tooltip" translatable="yes">Fsets
Info</property>
<property name="label" translatable="yes">_Fsets
Info</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_fsetsInfo_activate"/>
@@ -219,7 +219,7 @@
<child>
<widget class="GtkImageMenuItem" id="editRepo">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear
Rootstraps</property>
+ <property name="tooltip" translatable="yes">Edit
Repo</property>
<property name="label" translatable="yes">_Edit
Repo</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_editRepo_activate"/>
@@ -1413,7 +1413,7 @@
<widget class="GtkButton" id="edit_repo">
<property name="visible">True</property>
<property
name="sensitive">False</property>
- <property name="tooltip"
translatable="yes">Upgrade Target</property>
+ <property name="tooltip"
translatable="yes">Edit, add or remove repositories</property>
<property name="can_focus">True</property>
<property
name="relief">GTK_RELIEF_NORMAL</property>
<property
name="focus_on_click">True</property>
diff --git a/moblin-image-creator.spec b/moblin-image-creator.spec
index c171b0d..31c607c 100644
--- a/moblin-image-creator.spec
+++ b/moblin-image-creator.spec
@@ -64,6 +64,9 @@ rm -rf %{buildroot}
* Mon Nov 27 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
- 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 <[EMAIL PROTECTED]>
+- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=112. Thanks to
Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
+- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=182. Thanks to
Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
* Wed Nov 26 2008 Prajwal Mohan <[EMAIL PROTECTED]>
- Changing fsets
diff --git a/platforms/common-apt/initramfs/usb
b/platforms/common-apt/initramfs/usb
index 631376c..a039d1b 100755
--- a/platforms/common-apt/initramfs/usb
+++ b/platforms/common-apt/initramfs/usb
@@ -18,6 +18,7 @@ mountroot ()
# Find the USB flash drive
while true
do
+ for try in '1' '2' '3'; do
for device in 'sda' 'sdb' 'sdc' 'sdd'; do
echo "checking device /dev/${device} for installation source..."
if [ -e /sys/block/${device}/removable ]; then
@@ -32,22 +33,44 @@ mountroot ()
if [ "$found" = "yes" ]; then
break;
fi
- echo "/dev/${device} does not contain a rootfs"
- fi
+ echo "/dev/${device} does not contain a rootfs"
+ fi
+ fi
+ done
+ if [ "$found" = "yes" ]; then
+ break;
fi
+ echo "Sleeping for 5 seconds"
+ /bin/sleep 5
+ echo "Sleeping finished"
done
if [ "$found" = "yes" ]; then
- break;
+ break;
fi
- echo "Sleeping for 5 seconds"
+ echo "Trying non-removable drives"
/bin/sleep 5
- echo "Sleeping finished"
+ for device in 'sda' 'sdb' 'sdc' 'sdd'; do
+ echo "checking device /dev/${device} for installation source..."
+ mount /dev/${device} /mnt
+ if [ -f /mnt/rootfs.img ] ; then
+ echo "Found Boot drive at /dev/${device}"
+ found="yes"
+ fi
+ umount /dev/${device}
+ if [ "$found" = "yes" ]; then
+ break;
+ fi
+ echo "/dev/${device} does not contain a rootfs"
+ done
+ if [ "$found" = "yes" ]; then
+ break;
+ fi
done
echo "will mount root from /dev/${device}"
mount -o rw /dev/${device} /container 2> /dev/null
while [ ! -e "/container/rootfs.img" ]; do
- /bin/sleep 0.5
+ /bin/sleep 1
mount -o rw /dev/${device} /container 2> /dev/null
done
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
