bootdisk/trunk/batch-installer/ui: ui-main ui-wizard
Author: hawk
Date: Tue Mar 21 22:42:28 2006
New Revision: 7261
Modified:
bootdisk/trunk/batch-installer/ui/ui-main
bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- depending on bootdisk type show only available installation source types
Modified: bootdisk/trunk/batch-installer/ui/ui-main
==
--- bootdisk/trunk/batch-installer/ui/ui-main (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main Tue Mar 21 22:42:28 2006
@@ -72,10 +72,15 @@
br
meta title=$(nls Type of installation)
menu id=res_menu res=1
-item id=cdrom_cdrom: `nls CD-ROM device`
-item id=net_net: `nls network server (ftp, http)`
-item id=nfs_nfs: `nls NFS server`
-item id=disk_disk: `nls Hard disk partition`
+$(
+ if test -f /etc/bootdisk_cd || test -f /etc/bootdisk_iso; then
+echo item id=cdrom_cdrom: `nls CD-ROM device`
+echo item id=disk_disk: `nls Hard disk partition`
+ elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test
-f /etc/bootdisk_iso; then
+echo item id=net_net: `nls network server (ftp, http)`
+echo item id=nfs_nfs: `nls NFS server`
+ fi
+)
/menu
$@
EOF
Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Tue Mar 21 22:42:28 2006
@@ -208,28 +208,30 @@
meta active=source
br
menu id=source res=1002 selected=$source
-item id=cdrom_cdrom: $(nls CD-ROM device)
-item id=net_net: $(nls network server (ftp, http))
-item id=nfs_nfs: $(nls NFS server)
-item id=disk_disk: $(nls Hard disk partition)
+$(
+ if test -f /etc/bootdisk_cd || test -f /etc/bootdisk_iso; then
+echo item id=cdrom_cdrom: $(nls CD-ROM device)
+echo item id=disk_disk: $(nls Hard disk partition)
+ elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test -f
/etc/bootdisk_iso; then
+echo item id=net_net: $(nls network server (ftp, http))
+echo item id=nfs_nfs: $(nls NFS server)
+ fi
+)
/menu
br
$(nls Please select device you are going to install from, then press
brEnter or Next .)
+brbr
+$(
+ if test -f /etc/bootdisk_cd ; then
+echo $(nls For network based installation, please use
bootdisk_net.imgbror boot your computer from installation CD. If you have
PCMCIAbrnetwork card, please use bootdisk_pcmcia.img.)
+ elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia ; then
+echo $(nls For CD or disk based installation, please use
bootdisk_cd.imgbror boot your computer from installation CD.)
+ fi
+)
EOF
}
post_source1 () {
- if [ $source = cdrom ] || [ $source = disk ]; then
-if ! test -f /etc/bootdisk_cd ! test -f /etc/bootdisk_iso; then
- info $(nls For CD or disk based installation, please use
bootdisk_cd.imgbror boot your computer from installation CD.)
- return 1;
-fi
- elif [ $source = net ] || [ $source = nfs ]; then
-if ! test -f /etc/bootdisk_net ! test -f /etc/bootdisk_pcmcia ! test
-f /etc/bootdisk_iso; then
- info $(nls For network based installation, please use
bootdisk_net.imgbror boot your computer from installation CD. If you have
PCMCIAbrnetwork card, please use bootdisk_pcmcia.img.)
- return 1;
-fi
- fi
}
###
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui: ui-main ui-wizard
Author: hawk Date: Sun Feb 5 20:35:27 2006 New Revision: 6930 Modified: bootdisk/trunk/batch-installer/ui/ui-main bootdisk/trunk/batch-installer/ui/ui-wizard Log: - sort list 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 Sun Feb 5 20:35:27 2006 @@ -240,7 +240,7 @@ match($4, /i2o\/hd[a-h]*$/)) print /dev/ $4 } - ' /proc/partitions` + ' /proc/partitions | sort` for dev in $avail_dest_devices; do # filter out IDE CD-ROMs media=`echo /proc/ide/$dev/media | sed -e 's|/dev/||g'` Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Sun Feb 5 20:35:27 2006 @@ -731,7 +731,7 @@ match($4, /i2o\/hd[a-h]*$/)) print /dev/ $4 } -' /proc/partitions` +' /proc/partitions | sort` if test -z $avail_dest_devices; then info $(nls No available destination devices found.) ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui: ui-main ui-wizard
Author: hawk
Date: Tue Dec 6 22:43:43 2005
New Revision: 6602
Modified:
bootdisk/trunk/batch-installer/ui/ui-main
bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- doh, I'm blind, ide-detect is always required with IDE, lets
use name 'ide-generic' here
Modified: bootdisk/trunk/batch-installer/ui/ui-main
==
--- bootdisk/trunk/batch-installer/ui/ui-main (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main Tue Dec 6 22:43:43 2005
@@ -668,7 +668,7 @@
ui-hostadapters_modules () {
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 you wish to use. If unsure, type 'ide-generic' for Generic IDE.`
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)'
@@ -691,7 +691,7 @@
echo item id=\$module\$module: $name
done
)
-item id=ide-detectide-detect: `nls Generic IDE driver`
+item id=ide-genericide-generic: `nls Generic IDE driver`
/menu
$@
EOF
Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Tue Dec 6 22:43:43 2005
@@ -144,7 +144,7 @@
done
)
- item id=ide-detect checked=0$(nls Generic IDE driver)
+ item id=ide-generic checked=0$(nls Generic IDE driver)
/menubr
$ok_cancel
EOF
@@ -241,7 +241,6 @@
if [ $real_system = no ] ; then
detected_ide=`detect-pci-devices ide -m`
- detected_ide=$detected_ide ide-detect
detected_scsi=`detect-pci-devices scsi -m`
for ide in $detected_ide; do
if echo $hostadapters_modules | grep -q $ide; then
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui: ui-main ui-wizard
Author: hawk
Date: Tue Nov 22 19:39:39 2005
New Revision: 6550
Modified:
bootdisk/trunk/batch-installer/ui/ui-main
bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- cosmetics
Modified: bootdisk/trunk/batch-installer/ui/ui-main
==
--- bootdisk/trunk/batch-installer/ui/ui-main (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main Tue Nov 22 19:39:39 2005
@@ -644,7 +644,7 @@
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
-meta title='$(nls IDE/SCSI/SATA devices kernel module selection)'
+meta title='$(nls IDE/SCSI/SATA adapters kernel module selection)'
menu id=res_menu res=1
item id=ui_custom${custom_text}
$(
Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Tue Nov 22 19:39:39 2005
@@ -119,9 +119,9 @@
local entry module name
dial EOF
-meta title='$(nls IDE/SCSI/SATA devices kernel module selection)'
+meta title='$(nls IDE/SCSI/SATA adapters kernel module selection)'
br
-$(nls Please select for which IDE/SCSI/SATA adapters you want to load.)br
+$(nls Please select for which IDE/SCSI/SATA adapters you want to load)br
$(nls kernel module. If unsure, select Generic IDE.)brbr
$(nls Detected hardware:)brbr
menu id=devmodules checked=$hostadapters_modules
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
