bootdisk/trunk/batch-installer/ui/ui-main

[hawk]

Author: hawk
Date: Sat Dec  3 18:35:37 2005
New Revision: 6584

Modified:
   bootdisk/trunk/batch-installer/ui/ui-main
Log:
- added load_device_modules in dest_devices dialog
- cosmetics


Modified: bootdisk/trunk/batch-installer/ui/ui-main
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-main	(original)
+++ bootdisk/trunk/batch-installer/ui/ui-main	Sat Dec  3 18:35:37 2005
@@ -208,11 +208,21 @@
 
 
 ui-dest_devices () {
-item5="/dev/hda /dev/hdb"
-item6="/dev/hda /dev/hdc"
-dml <<EOF 
+if test -z "$hostadapters_modules"; then
+  dml <<EOF
+    <meta title="$(nls "Information")">
+    <meta active=$act>
+    <br>
+    <br>`nls "hostadapters_modules must be set before selecting destination devices."`
+    <br><br>
+    <button res=1>
+EOF
+else
+  # execute load_device_modules with output redirected to current console
+  load_device_modules "$hostadapters_modules" 1>/dev/tty 2>/dev/tty
+  dml <<EOF 
     <br>`nls "Please specify space delimited list of destination disks."`
-    <br>`nls "If you have only one disk, you may select appropriate from the list."`
+    <br>`nls "If you have only one disk, you may select it from the list."`
     <br>`nls "Example: /dev/hda /dev/hdc"`
     <br>
     <meta title="$(nls "Set of destination disks")">
@@ -238,6 +248,7 @@
     </menu>
     $@
 EOF
+fi
 }
 
 ui-boot_loader_other () {
@@ -658,7 +669,7 @@
 dml <<EOF 
     <br>`nls "Put the names of kernel modules for your IDE/SCSI/SATA adapters"`
     <br>`nls "you wish to use. If unsure, type 'ide-detect' for Generic IDE."`
-    <br>`nls "If you have only one adapter, you may select appropriate from the list."`
+    <br>`nls "If you have only one adapter, you may select it from the list."`
     <br>
     <meta title='$(nls "IDE/SCSI/SATA adapters kernel module selection")'>
     <menu id=res_menu res=1>
@@ -669,14 +680,14 @@
       autoscsimods=`detect-pci-devices scsi -i | sort -u`
       for entry in $autoscsimods; do
         module=`echo $entry | awk -F "|" '{print $1}'`
-        name=`echo $entry | awk -F "|" '{printf "%.55s",$2}'`
+        name=`echo $entry | awk -F "|" '{printf "%.58s",$2}'`
         echo "<item id=$module>$module: $name"
       done
       
       autoidemods=`detect-pci-devices ide -i | sort -u`
       for entry in $autoidemods; do
         module=`echo $entry | awk -F "|" '{print $1}'`
-	name=`echo $entry | awk -F "|" '{printf "%.55s",$2}'`
+	name=`echo $entry | awk -F "|" '{printf "%.58s",$2}'`
 	echo "<item id=\"$module\">$module: $name"
       done
     )