bootdisk/trunk/batch-installer/ui/ui-main
Author: hawk Date: Wed Mar 22 13:27:33 2006 New Revision: 7269 Modified: bootdisk/trunk/batch-installer/ui/ui-main Log: - oops! show all source type for bootdisk_iso Modified: bootdisk/trunk/batch-installer/ui/ui-main == --- bootdisk/trunk/batch-installer/ui/ui-main (original) +++ bootdisk/trunk/batch-installer/ui/ui-main Wed Mar 22 13:27:33 2006 @@ -76,7 +76,8 @@ 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 + fi + if 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 ___ 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 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
Author: hawk Date: Sun Mar 19 19:59:03 2006 New Revision: 7224 Modified: bootdisk/trunk/batch-installer/ui/ui-main Log: - allow more filesystems with source=disk - added missing fi - cosmetics Modified: bootdisk/trunk/batch-installer/ui/ui-main == --- bootdisk/trunk/batch-installer/ui/ui-main (original) +++ bootdisk/trunk/batch-installer/ui/ui-main Sun Mar 19 19:59:03 2006 @@ -72,7 +72,7 @@ br meta title=$(nls Type of installation) menu id=res_menu res=1 -item id=cdrom_cdrom +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` @@ -123,6 +123,7 @@ done fi autocdrom=$(echo $autocdrom | sed -e 's/^ //') +fi ;; esac @@ -224,9 +225,12 @@ br meta title=$(nls Source filesystem) menu id=res_menu res=1 - item id=ext2`nls Linux ext2 filesystem` - item id=reiserfs`nls Reiser FS filesystem` - item id=vfat`nls FAT or FAT32 filesystem (eg. Windows partition)` + item id=ext2ext2: `nls Linux ext2 filesystem` + item id=reiserfsreiserfs: `nls Reiser FS filesystem` + item id=jfsjfs: `nls IBM Journaling Filesystem` + item id=ext3ext3: `nls Journaling version of ext2` + item id=xfsxfs: `nls SGI Journaling Filesystem` + item id=vfatvfat: `nls FAT or FAT32 filesystem` /menu $@ EOF ;; ___ 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-parted2
Author: hawk Date: Sun Mar 19 21:01:42 2006 New Revision: 7233 Modified: bootdisk/trunk/batch-installer/ui/ui-main bootdisk/trunk/batch-installer/ui/ui-parted2 Log: - more mountpoints Modified: bootdisk/trunk/batch-installer/ui/ui-main == --- bootdisk/trunk/batch-installer/ui/ui-main (original) +++ bootdisk/trunk/batch-installer/ui/ui-main Sun Mar 19 21:01:42 2006 @@ -442,7 +442,7 @@ example_mnt_point_items () { local desc id dir i -for i in swap / /boot /home /home/users /usr /var /var/spool; do +for i in swap / /boot /home /home/users /home/services /srv /usr /var /var/lib /var/log /var/mail /var/spool; do desc= id=0 while : ; do Modified: bootdisk/trunk/batch-installer/ui/ui-parted2 == --- bootdisk/trunk/batch-installer/ui/ui-parted2(original) +++ bootdisk/trunk/batch-installer/ui/ui-parted2Sun Mar 19 21:01:42 2006 @@ -640,12 +640,15 @@ item id=// ($(nls Root filesystem)) item id=/boot/boot item id=/home/home +item id=/home/users/home/users +item id=/home/services/home/services +item id=/srv/srv item id=/usr/usr item id=/var/var -item id=/var/spool/var/spool +item id=/var/lib/var/lib +item id=/var/log/var/log item id=/var/mail/var/mail -item id=/var/cache/var/cache -item id=/home/users/home/users +item id=/var/spool/var/spool item id=custom$(nls _C_u_s_t_o_m) item id=skip$(nls Don't use for installation.) /menu ___ 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
Author: hawk Date: Wed Mar 15 11:16:41 2006 New Revision: 7166 Modified: bootdisk/trunk/batch-installer/ui/ui-main Log: - make sure that hostadapters_modules are set and loaded before selecting source devices (only for source type cdrom and disk) - show more detailed list of CD-ROMs, mark detected ones - with source type disk show only detected patitions in source partition selection dialog Modified: bootdisk/trunk/batch-installer/ui/ui-main == --- bootdisk/trunk/batch-installer/ui/ui-main (original) +++ bootdisk/trunk/batch-installer/ui/ui-main Wed Mar 15 11:16:41 2006 @@ -81,79 +81,138 @@ EOF } +cd_det () { + if echo $autocdrom | grep -q $1 ; then +nls (detected) + fi +} + ui-source_device () { -case $source in -cdrom) - item1=/dev/hda - item2=/dev/hdb - item3=/dev/hdc - item4=/dev/hdd - item5=/dev/scd0 - item6=/dev/scd1 - item7=/dev/scd2 - item8=/dev/scd3 - item9=/dev/scd4 - dml EOF - br`nls If you have single IDE cdrom, choose auto` - br - meta title=CDROM - menu id=res_menu res=1 - item id=ui_custom${custom_text} - item id=auto${auto_text} - item id=$item1$item1 - item id=$item2$item2 - item id=$item3$item3 - item id=$item4$item4 - item id=$item5$item5 - item id=$item6$item6 - item id=$item7$item7 - item id=$item8$item8 - item id=$item9$item9 - /menu - $@ -EOF - ;; -nfs) - item1=192.168.0.1:/home/users/klakier/rpm - item2=heaven.net:/pub/all/saints +local bailout scds cscd +bailout= +autocdrom= + +case $source in +cdrom|disk) +if test -z $hostadapters_modules; then dml EOF - br`nls NFS device should be given in form machine:/directory.` + meta title=$(nls Information) + meta active=$act br - meta title=$(nls NFS server) - menu id=res_menu res=1 - item id=ui_custom${custom_text} - item id=$item1$item1 - item id=$item2$item2 - /menu - $@ + br`nls hostadapters_modules must be set before selecting source devices.` + brbr + button res=1 EOF - ;; -net) - dml EOF - br`nls Choose server or enter custom one` - br - meta title=$(nls Remote server) - menu id=res_menu res=1 - item id=ui_custom${custom_text} -$(ui-mirror just-dump) - /menu - $@ + bailout=true +else + # execute load_device_modules with output redirected to current console + load_device_modules $hostadapters_modules 1/dev/tty 2/dev/tty + if [ -d /proc/ide ] ; then + for f in /proc/ide/hd* ; do + if [ -f $f/media ] [ $(cat $f/media) = cdrom ] ; then + autocdrom=$autocdrom /dev/`basename $f` + fi + done + fi + if [ -f /proc/scsi/scsi ] ; then + scds=`cat /proc/scsi/scsi | grep Type:.*CD-ROM | wc -l` + cscd=0 + while [ $cscd -lt $scds ]; do + autocdrom=$autocdrom /dev/scd$cscd + cscd=$(($cscd+1)) + done + fi + autocdrom=$(echo $autocdrom | sed -e 's/^ //') +;; +esac + +if test -z $bailout; then +case $source in +cdrom) + dml EOF + br`nls Choose your CD-ROM device. If you have single CD drive, choose auto.` + br + meta title='$(nls CD-ROM device)' + menu id=res_menu res=1 + item id=ui_custom${custom_text} + item id=auto${auto_text} + item id=/dev/hda/dev/hda $(nls (Primary Master)) $(cd_det /dev/hda) + item id=/dev/hdb/dev/hdb $(nls (Primary Slave)) $(cd_det /dev/hdb) + item id=/dev/hdc/dev/hdc $(nls (Secondary Master)) $(cd_det /dev/hdc) + item id=/dev/hdd/dev/hdd $(nls (Secondary Slave)) $(cd_det /dev/hdd) + item id=/dev/scd0/dev/scd0 $(nls (SCSI CD-ROM #0)) $(cd_det /dev/scd0) + item id=/dev/scd1/dev/scd1 $(nls (SCSI CD-ROM #1)) $(cd_det /dev/scd1) + item id=/dev/scd2/dev/scd2 $(nls (SCSI CD-ROM #2)) $(cd_det /dev/scd2) + item id=/dev/scd3/dev/scd3 $(nls (SCSI CD-ROM #3)) $(cd_det /dev/scd3) + /menu + $@ EOF ;; -disk) - dml EOF - br`nls Choose partition or enter custom one` + disk) + dml EOF + br`nls Choose partition or enter custom one.` br meta title=$(nls Disk partition with source) menu id=res_menu res=1 item id=ui_custom${custom_text} - item id=/dev/hda1/dev/hda1 - item id=/dev/hda2/dev/hda2
bootdisk/trunk/batch-installer/ui/ui-main
Author: hawk Date: Mon Feb 20 00:15:12 2006 New Revision: 6980 Modified: bootdisk/trunk/batch-installer/ui/ui-main 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 Mon Feb 20 00:15:12 2006 @@ -655,7 +655,7 @@ item id=2.4`nls Linux 2.4.x` $( if ! test -f /tmp/is-mini-iso ; then - echo item id=2.4om$(nls 'Linux 2.4.x with OpenMosix') +echo item id=2.4om$(nls 'Linux 2.4.x with OpenMosix') fi ) item id=2.6`nls Linux 2.6.x` ___ 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
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.` +brbr +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 ) ___ 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
Author: hawk Date: Thu Nov 24 22:52:45 2005 New Revision: 6565 Modified: bootdisk/trunk/batch-installer/ui/ui-main Log: - updated dest_devices selection dialog Modified: bootdisk/trunk/batch-installer/ui/ui-main == --- bootdisk/trunk/batch-installer/ui/ui-main (original) +++ bootdisk/trunk/batch-installer/ui/ui-main Thu Nov 24 22:52:45 2005 @@ -211,14 +211,30 @@ item5=/dev/hda /dev/hdb item6=/dev/hda /dev/hdc dml EOF -br`nls Enter or choose set of destination disks` +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 Example: /dev/hda /dev/hdc` br meta title=$(nls Set of destination disks) menu id=res_menu res=1 item id=ui_custom${custom_text} -`ide_disk_items` -item id=$item5$item5: `nls Example entry for two IDE disks` -item id=$item6$item6: `nls Example entry for two IDE disks` +$( + avail_dest_devices=`awk ' +{ +if (match($4, /hd[a-h]$/) || +match($4, /sd[a-h]$/) || +match($4, /rd\/c[0-9]d[0-9]*$/) || +match($4, /ida\/c[0-9]d[0-9]*$/) || +match($4, /cciss\/c[0-9]d[0-9]*$/) || +match($4, /ataraid\/d[0-9]*$/) || +match($4, /i2o\/hd[a-h]*$/)) +print /dev/ $4 +} + ' /proc/partitions` + for dev in $avail_dest_devices; do +echo item id=$dev$dev $(disk_name $dev) + done +) /menu $@ EOF ___ 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