This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 3 ++-
moblin-image-creator.spec | 4 ++++
platforms/common-apt/install.sh | 27 ++++++++++++++++++++++++---
platforms/common-yum/install.sh | 27 ++++++++++++++++++++++++---
4 files changed, 54 insertions(+), 7 deletions(-)
New commits:
commit a0a42494e405182a84da8df52e096baf23dbab1b
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Wed Dec 3 19:29:27 2008 +0900
Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=194. 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 15296b0..1d2c709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,9 @@ moblin-image-creator (0.48) gaston; urgency=low
* 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]>
* Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=189. Thanks
to Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
+ * Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=194. Thanks
to Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Mon, 01 Dec 2008 15:35:21 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Wed, 03 Dec 2008 19:26:43 +0900
moblin-image-creator (0.47) gaston; urgency=low
diff --git a/moblin-image-creator.spec b/moblin-image-creator.spec
index 63f26e8..1a88ea2 100644
--- a/moblin-image-creator.spec
+++ b/moblin-image-creator.spec
@@ -61,6 +61,10 @@ rm -rf %{buildroot}
/var/lib/moblin-image-creator/projects
%changelog
+* Wed Dec 03 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
+- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=194. Thanks to
+ Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
+
* Mon Dec 01 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
- Fixing a bug about http://bugzilla.moblin.org/show_bug.cgi?id=189. Thanks to
Juan Jesus Ojeda Croissier <[EMAIL PROTECTED]>
diff --git a/platforms/common-apt/install.sh b/platforms/common-apt/install.sh
index 9498355..d78ccca 100755
--- a/platforms/common-apt/install.sh
+++ b/platforms/common-apt/install.sh
@@ -62,9 +62,10 @@ splash_display 'INSTALL..........'
pre_scsi_disk_number=$( ls /sys/class/scsi_disk | wc -l)
found=no
# Find the install disk
-while true; do
- for device in 'hda' 'hdb' 'sda' 'sdb'
- do
+while true
+do
+ for try in '1' '2' '3'; do
+ for device in 'hda' 'hdb' 'sda' 'sdb' 'sdc' 'sdd'; do
echo "checking device: /dev/${device} for installation target"
if [ -e /sys/block/${device}/removable ]; then
if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then
@@ -84,6 +85,26 @@ while true; do
fi
/bin/sleep 5
echo "Did not find an installation target device"
+ done
+ echo "Trying non-removable drives"
+ /bin/sleep 5
+ for device in 'hda' 'hdb' '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 install to /dev/${device}"
diff --git a/platforms/common-yum/install.sh b/platforms/common-yum/install.sh
index dd76dea..b0be1d0 100755
--- a/platforms/common-yum/install.sh
+++ b/platforms/common-yum/install.sh
@@ -62,9 +62,10 @@ splash_display 'INSTALL..........'
pre_scsi_disk_number=$( ls /sys/class/scsi_disk | wc -l)
found=no
# Find the install disk
-while true; do
- for device in 'hda' 'hdb' 'sda' 'sdb'
- do
+while true
+do
+ for try in '1' '2' '3'; do
+ for device in 'hda' 'hdb' 'sda' 'sdb' 'sdc' 'sdd'; do
echo "checking device: /dev/${device} for installation target"
if [ -e /sys/block/${device}/removable ]; then
if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then
@@ -84,6 +85,26 @@ while true; do
fi
/bin/sleep 5
echo "Did not find an installation target device"
+ done
+ echo "Trying non-removable drives"
+ /bin/sleep 5
+ for device in 'hda' 'hdb' '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 install to /dev/${device}"
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
