bootdisk/trunk/batch-installer/ui: ui-main ui-wizard
hawk
cvs at pld-linux.org
Wed Dec 7 16:33:01 CET 2005
Author: hawk
Date: Wed Dec 7 16:32:44 2005
New Revision: 6609
Modified:
bootdisk/trunk/batch-installer/ui/ui-main
bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- filter out IDE CD-ROMs from lists of available destination devices
Modified: bootdisk/trunk/batch-installer/ui/ui-main
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-main (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main Wed Dec 7 16:32:44 2005
@@ -242,7 +242,15 @@
}
' /proc/partitions`
for dev in $avail_dest_devices; do
- echo "<item id=$dev>$dev $(disk_name $dev)"
+ # filter out IDE CD-ROMs
+ media=`echo "/proc/ide/$dev/media" | sed -e 's|/dev/||g'`
+ if [ -f $media ] ; then
+ if [ "$(cat $media)" != "cdrom" ] ; then
+ echo "<item id=$dev>$dev $(disk_name $dev)"
+ fi
+ else
+ echo "<item id=$dev>$dev $(disk_name $dev)"
+ fi
done
)
</menu>
Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Wed Dec 7 16:32:44 2005
@@ -761,7 +761,15 @@
<menu id=dd selected=$dest_devices>
$(
for f in $avail_dest_devices ; do
- echo "<item id=$f>$f $(disk_name $f)"
+ # we must filter out IDE CD-ROMs
+ media=`echo "/proc/ide/$f/media" | sed -e 's|/dev/||g'`
+ if [ -f $media ] ; then
+ if [ "$(cat $media)" != "cdrom" ] ; then
+ echo "<item id=$f>$f $(disk_name $f)"
+ fi
+ else
+ echo "<item id=$f>$f $(disk_name $f)"
+ fi
done
)
</menu><br>
@@ -777,7 +785,15 @@
<menu id=dd checked="$dest_devices">
$(
for f in $avail_dest_devices ; do
- echo "<item id=$f checked=0>$f $(disk_name $f)"
+ # we must filter out IDE CD-ROMs
+ media=`echo "/proc/ide/$f/media" | sed -e 's|/dev/||g'`
+ if [ -f $media ] ; then
+ if [ "$(cat $media)" != "cdrom" ] ; then
+ echo "<item id=$f checked=0>$f $(disk_name $f)"
+ fi
+ else
+ echo "<item id=$f checked=0>$f $(disk_name $f)"
+ fi
done
)
</menu><br>
More information about the pld-cvs-commit
mailing list