bootdisk/trunk/batch-installer/ui/ui-wizard
Author: hawk Date: Wed Mar 15 11:10:22 2006 New Revision: 7165 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - fixed bug with reporting incorrect number of SCSI CD-ROMs on some hardware - default /boot size increased to 30 MBs - root partition on ext2 by default Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Wed Mar 15 11:10:22 2006 @@ -274,7 +274,7 @@ done fi if [ -f /proc/scsi/scsi ] ; then - scds=`cat /proc/scsi/scsi | grep "CD-ROM" | wc -l` + scds=`cat /proc/scsi/scsi | grep "Type:.*CD-ROM" | wc -l` cscd=0 while [ $cscd -lt $scds ]; do autocdrom="$autocdrom /dev/scd$cscd" @@ -658,7 +658,7 @@ nls "Default scheme is:" # maybe remove /boot altogether? - nls "1st partition on /boot (20 Mb)" + nls "1st partition on /boot (30 Mb)" nls "2nd partition on swap (%d Mb)" "$swap_size" nls "3rd partition on / (rest)" } @@ -688,7 +688,7 @@ dest_part1_format_partition=yes dest_part1_options=defaults dest_part1_format_options= - dest_part1_size=20 + dest_part1_size=30 dest_part2_device=$dest_part"2" dest_part2_mnt_point=swap @@ -700,7 +700,7 @@ dest_part3_device=$dest_part"3" dest_part3_mnt_point=/ - dest_part3_filesystem=xfs + dest_part3_filesystem=ext2 dest_part3_format_partition=yes dest_part3_options=defaults dest_part3_format_options= ___ 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-wizard
Author: hawk Date: Tue Mar 21 15:26:52 2006 New Revision: 7256 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - more specific DMA information - don't set install type LAST while we weren't installing yet 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 15:26:52 2006 @@ -152,7 +152,7 @@ $(nls "Generic IDE driver") -$(nls "Try to enable DMA for IDE devices") +$(nls "Try to enable DMA for IDE devices during installation") $ok_cancel EOF @@ -880,20 +880,13 @@ pkgsets=`cat $pkgsetsdir/.list` if [ "$last_pkg_set" = "" ] ; then -# if /etc/installer.pkgs contains basic pkgset, we can select it -# or mini-iso, otherwise config was loaded from disk or created -# using some other way and we shouldn't touch it unless explicitly -# told to. +# if /etc/installer.pkgs contains basic pkgset, or mini-iso we +# may preselect it, otherwise config was loaded from disk or created +# using some other way and we shouldn't touch it if [ $(md5 $pkgsetsdir/base) = $(md5 $pkgsfile) ] ; then - if test -f /tmp/is-mini-iso ; then -last_pkg_set=$pkgsetsdir/MINI-ISO - else -last_pkg_set=$pkgsetsdir/base - fi -else - last_pkg_set=$pkgsetsdir/LAST - cp $pkgsfile $last_pkg_set - pkgsets="$pkgsets LAST" + last_pkg_set=$pkgsetsdir/base +elif [ $(md5 $pkgsetsdir/MINI-ISO) = $(md5 $pkgsfile) ] ; then + last_pkg_set=$pkgsetsdir/MINI-ISO fi fi echo "" ___ 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-wizard
Author: hawk Date: Wed Mar 22 13:28:20 2006 New Revision: 7270 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - oops! show all source type for bootdisk_iso - cosmetics Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Wed Mar 22 13:28:20 2006 @@ -212,7 +212,8 @@ if test -f /etc/bootdisk_cd || test -f /etc/bootdisk_iso; then echo "_cdrom: $(nls "CD-ROM device")" echo "_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 "_net: $(nls "network server (ftp, http)")" echo "_nfs: $(nls "NFS server")" fi @@ -220,12 +221,11 @@ $(nls "Please select device you are going to install from, then press Enter or Next >>.") - $( if test -f /etc/bootdisk_cd ; then -echo $(nls "For network based installation, please use bootdisk_net.imgor boot your computer from installation CD. If you have PCMCIAnetwork card, please use bootdisk_pcmcia.img.") +echo $(nls "For network based installation, please use bootdisk_net.imgor boot your computer from installation CD. If you have PCMCIAnetwork 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.imgor boot your computer from installation CD.") +echo $(nls "For CD or disk based installation, please use bootdisk_cd.imgor boot your computer from installation CD.") fi ) 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-wizard
Author: hawk Date: Sun Feb 5 18:24:51 2006 New Revision: 6928 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - list package sets in specified order - updated installation types descriptions 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 18:24:51 2006 @@ -875,6 +875,10 @@ } display_profile () { + local pkgsets + + pkgsets=`cat $pkgsetsdir/.list` + if [ "$last_pkg_set" = "" ] ; then # if /etc/installer.pkgs contains basic pkgset, we can select it # or mini-iso, otherwise config was loaded from disk or created @@ -889,6 +893,7 @@ else last_pkg_set=$pkgsetsdir/LAST cp $pkgsfile $last_pkg_set + pkgsets="$pkgsets LAST" fi fi echo "" @@ -899,56 +904,55 @@ else echo "" fi - for f in $pkgsetsdir/* ; do -name=$(basename $f) + for name in $pkgsets ; do if [ "$name" = CVS ] ; then continue fi if test -f /tmp/is-mini-iso && [ "$name" != MINI-ISO ] && [ "$name" != minimal ] && [ "$name" != LAST ] ; then continue fi -echo "_$name" +echo "_$name" size=$(nls "unknown") desc1=$(nls "Group %s" "$name") desc2= case "$name" in minimal ) -desc1=$(nls "Just very basic packages.") +desc1=$(nls "Just very basic packages") desc2=$(nls "Don't select unless you're doing embedded system") - size=$(nls '70MB without docs, one locale') + size=$(nls '57MB without docs, one locale') ;; base ) -desc1=$(nls "Base PLD Linux installation.") - size=$(nls '186MB with default set of packages') +desc1=$(nls "Base PLD Linux installation") + size=$(nls '221MB with default set of packages') ;; devel ) -desc1=$(nls "Base PLD Linux installation + basic development packages.") - size=$(nls '328MB with default set of packages') +desc1=$(nls "Base PLD Linux installation + basic development packages") + size=$(nls '387MB with default set of packages') ;; server ) desc1=$(nls "Server installation with most of services and daemons") - size=$(nls '254MB with default set of packages') + size=$(nls '297MB with default set of packages') ;; gnome-workstation ) desc1=$(nls "X workstation running GNOME") - size=$(nls '406MB with default set of packages') + size=$(nls '505MB with default set of packages') ;; kde-workstation ) desc1=$(nls "X workstation running KDE") - size=$(nls '368MB with default set of packages') + size=$(nls '477MB with default set of packages') ;; icewm-workstation ) desc1=$(nls "X workstation running IceWM") - size=$(nls '264MB with default set of packages') + size=$(nls '349MB with default set of packages') ;; wmaker-workstation ) desc1=$(nls "X workstation running WindowMaker") - size=$(nls '268MB with default set of packages') + size=$(nls '365MB with default set of packages') ;; MINI-ISO ) -desc1=$(nls "Base packages + ppp, poldek.") - desc2=$(nls "Select this if you're installing from MINI-ISO.") - size=$(nls '122MB with docs, all locales') +desc1=$(nls "Limited version of base installation") + desc2=$(nls "Select this if you're installing from MINI-ISO") + size=$(nls '157MB with docs, all locales') ;; LAST ) desc1=$(nls "Packages, you have selected last time.") @@ -966,9 +970,9 @@ post_profile () { if [ "$res" = 1002 -a "$pkg_set" != "$last_pkg_set" ] ; then -cp $pkg_set $pkgsfile +cp $pkgsetsdir/$pkg_set $pkgsfile if [ "$pkg_set" != LAST ] ; then - cp $pkg_set $pkgsetsdir/LAST + cp $pkgsetsdir/$pkg_set $pkgsetsdir/LAST fi last_pkg_set=$pkg_set 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-wizard
Author: hawk Date: Thu Nov 24 22:46:55 2005 New Revision: 6564 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - hopefully fixed disk detection via /proc/partitions Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Thu Nov 24 22:46:55 2005 @@ -702,10 +702,22 @@ select_dest_devices () { local avail_dest_devices tmp_devices - # get available destination devices from /proc/partitions - avail_dest_devices=`awk '{print $4" "$5}' /proc/partitions | \ - grep -v ' 0$' | awk '/[1-9]/ {print "/dev/"$1}' | - grep -v $source_device | sort` + # get available destination devices from /proc/partitions, + # we are looking only for IDE, SCSI/SATA, DAC960, Compaq IDA, + # Compaq NGDA, IDE raid and I2O 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` 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-wizard
Author: hawk Date: Thu Nov 24 23:17:15 2005 New Revision: 6568 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - oops! Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Thu Nov 24 23:17:15 2005 @@ -707,8 +707,7 @@ # Compaq NGDA, IDE raid and I2O disks. avail_dest_devices=`awk ' { -if ( -match($4, /hd[a-h]$/) || +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]*$/) || ___ 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-wizard
Author: hawk Date: Sat Dec 3 16:33:40 2005 New Revision: 6583 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - clear net_{prefix,gateway,dns} if dhcp was selected - 68 chars for controller name in hostadapter selection dialog Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Sat Dec 3 16:33:40 2005 @@ -132,14 +132,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 "%.72s",$2}'` + name=`echo $entry | awk -F "|" '{printf "%.68s",$2}'` echo "$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 "%.72s",$2}'` + name=`echo $entry | awk -F "|" '{printf "%.68s",$2}'` echo "$name" done @@ -610,6 +610,11 @@ } post_netip () { + if test "x$net_ipaddr" = "xdhcp"; then +net_prefix="" +net_gateway="" +net_dns="" + 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-wizard
Author: hawk Date: Tue Dec 6 12:42:34 2005 New Revision: 6599 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - cosmetics 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 12:42:34 2005 @@ -132,14 +132,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 "%.68s",$2}'` + name=`echo $entry | awk -F "|" '{printf "%.66s",$2}'` echo "$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 "%.68s",$2}'` + name=`echo $entry | awk -F "|" '{printf "%.66s",$2}'` echo "$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-wizard
Author: hawk Date: Tue Dec 6 23:44:23 2005 New Revision: 6604 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - oops! check for scsi CD-ROM if /proc/scsi/scsi exists 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 23:44:23 2005 @@ -263,6 +263,8 @@ autocdrom="$autocdrom /dev/`basename $f`" fi done + fi + if [ -f /proc/scsi/scsi ] ; then scds=`cat /proc/scsi/scsi | grep "CD-ROM" | wc -l` cscd=0 while [ $cscd -lt $scds ]; do ___ 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-wizard
Author: hawk Date: Wed Dec 7 00:20:41 2005 New Revision: 6605 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - small revert, required for bootdisk_cd to work with generic IDE 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 00:20:41 2005 @@ -241,6 +241,7 @@ if [ "$real_system" = no ] ; then detected_ide=`detect-pci-devices ide -m` +detected_ide="$detected_ide ide-generic" 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
SVN: bootdisk/trunk/batch-installer/ui/ui-wizard
Author: hawk Date: Sat Apr 7 14:59:41 2007 New Revision: 8444 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - updated installation sizes Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Sat Apr 7 14:59:41 2007 @@ -914,40 +914,40 @@ minimal ) desc1=$(nls "Just very basic packages") desc2=$(nls "Don't select unless you're doing embedded system") - size=$(nls '57MB without docs, one locale') + size=$(nls '64MB without docs, one locale') ;; base ) desc1=$(nls "Base PLD Linux installation") - size=$(nls '221MB with default set of packages') + size=$(nls '249MB with default set of packages') ;; devel ) desc1=$(nls "Base PLD Linux installation + basic development packages") - size=$(nls '387MB with default set of packages') + size=$(nls '415MB with default set of packages') ;; server ) desc1=$(nls "Server installation with most of services and daemons") - size=$(nls '297MB with default set of packages') + size=$(nls '338MB with default set of packages') ;; gnome-workstation ) desc1=$(nls "X workstation running GNOME") - size=$(nls '505MB with default set of packages') + size=$(nls '581MB with default set of packages') ;; kde-workstation ) desc1=$(nls "X workstation running KDE") - size=$(nls '477MB with default set of packages') + size=$(nls '526MB with default set of packages') ;; icewm-workstation ) desc1=$(nls "X workstation running IceWM") - size=$(nls '349MB with default set of packages') + size=$(nls '390MB with default set of packages') ;; wmaker-workstation ) desc1=$(nls "X workstation running WindowMaker") - size=$(nls '365MB with default set of packages') + size=$(nls '408MB with default set of packages') ;; MINI-ISO ) desc1=$(nls "Limited version of base installation") desc2=$(nls "Select this if you're installing from MINI-ISO") - size=$(nls '157MB with docs, all locales') + size=$(nls '170MB with docs, all locales') ;; LAST ) desc1=$(nls "Packages, you have selected last time.") ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: bootdisk/trunk/batch-installer/ui/ui-wizard
Author: hawk Date: Sun Apr 8 19:37:29 2007 New Revision: 8447 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - show input dialog instead of device list if no hardware was detected - cosmetics, small visual changes Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Sun Apr 8 19:37:29 2007 @@ -111,7 +111,7 @@ if test "$did_select_hostadapters_modules" && \ test "$(echo "$hostadapters_modules" | sed -e 's/ //g')" && \ yes_no yes $(nls "Do you want to keep IDE/SCSI/SATA adapters modules with:%s" "$hostadapters_modules") ; then -return 0 + return 0 fi did_select_hostadapters_modules=yes @@ -126,36 +126,42 @@ dial < -$(nls "Please select for which IDE/SCSI/SATA adapters you want to load") -$(nls "kernel module. If unsure, select Generic IDE.") -$(nls "Detected hardware:") - $( -IFS=" -" - 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 "%.66s",$2}'` - echo "$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 "%.66s",$2}'` - echo "$name" -done +if test -z "$autoscsimods" && test -z "$autoidemods" ; then + echo "$(nls "Module"): " +else + echo "$(nls "Please select for which IDE/SCSI/SATA adapters you want to load")" + echo "$(nls "kernel module. If unsure, select Generic IDE.")" + echo "$(nls "Detected hardware:")" + echo "" + OLDIFS=$IFS + IFS=" +" + for entry in $autoscsimods; do +module=`echo $entry | awk -F "|" '{print $1}'` +name=`echo $entry | awk -F "|" '{printf "%.66s",$2}'` +echo "$name" + done + + for entry in $autoidemods; do +module=`echo $entry | awk -F "|" '{print $1}'` +name=`echo $entry | awk -F "|" '{printf "%.66s",$2}'` +echo "$name" + done + IFS=$OLDIFS + echo "$(nls "Generic IDE driver")" + echo "" +fi ) - $(nls "Generic IDE driver") - $(nls "Try to enable DMA for IDE devices during installation") $ok_cancel EOF + if [ "$res" = 1 ] ; then if echo "$devmodules" | grep -q "^ *$" ; then return 1 @@ -508,48 +514,30 @@ } display_netdev () { - local mods - - if [ $real_system = no ] ; then -mods=$(detect-pci-devices net -m || :) - else -mods=$(cd ../pci; ./sh-scan-pci -m || :) - fi + local autonetmods custom_module - if [ "$mods" = "" ] ; then -# couldn't detect... -if [ -x /bin/pcic_probe ] ; then - echo "" -else - echo "" -fi -echo "" -grep -vs '^~' /etc/eth.list.in | while read line; do - dev=`echo $line | sed 's/\.o|.*//' | sed 's/_/__/'` - dev_esc=`echo $dev | sed 's/_/__/'` - desc=`echo $line | sed 's/[^|]*|//' | sed 's/|.*//'` - echo "$dev_esc: _$desc" + autonetmods=`detect-pci-devices net -i | sort -u` + if ! test -z "$autonetmods" ; then +echo "$(nls "Detected hardware:")" +echo "" +OLDIFS=$IFS +IFS=" +" +for entry in $autonetmods; do + module=`echo $entry | awk -F "|" '{print $1}'` + name=`echo $entry | awk -F "|" '{printf "%.66s",$2}'` + echo "$name" done -echo "" -echo "$(nls "Extra options (irq=10, etc.)"):" \ - "" +IFS=$OLDIFS +echo "" else -if echo $mods | grep -q ' ' ; then - nls "Detected network devices: %s" "$mods" - nls "First one will be used." - # TODO: maybe allow choice here? -else - nls "Detected network device: %s" "$mods" -fi -echo "" -echo "$(nls "Module "): " -nls "Leave this on 'auto'." -echo "$(nls "Extra options (irq=10, etc.)"):" \ - "" -nls "If unsure, leave this blank." +echo "$(nls "Module "): " fi + echo "$(nls "Extra options (irq=10, etc.)"):" \ +"" + nls "If unsure, leave this blank." - echo "" + echo "" } post_netdev () { ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: bootdisk/trunk/batch-installer/ui/ui-wizard
Author: hawk Date: Wed Apr 18 17:38:39 2007 New Revision: 8465 Modified: bootdisk/trunk/batch-installer/ui/ui-wizard Log: - busybox du gives bad values, updated all instalation sizes Modified: bootdisk/trunk/batch-installer/ui/ui-wizard == --- bootdisk/trunk/batch-installer/ui/ui-wizard (original) +++ bootdisk/trunk/batch-installer/ui/ui-wizard Wed Apr 18 17:38:39 2007 @@ -902,40 +902,44 @@ minimal ) desc1=$(nls "Just very basic packages") desc2=$(nls "Don't select unless you're doing embedded system") - size=$(nls '64MB without docs, one locale') + size=$(nls '56MB without docs, one locale') ;; base ) desc1=$(nls "Base PLD Linux installation") - size=$(nls '249MB with default set of packages') + size=$(nls '202MB with default set of packages') ;; devel ) desc1=$(nls "Base PLD Linux installation + basic development packages") - size=$(nls '415MB with default set of packages') + size=$(nls '341MB with default set of packages') ;; server ) desc1=$(nls "Server installation with most of services and daemons") - size=$(nls '338MB with default set of packages') + size=$(nls '297MB with default set of packages') ;; gnome-workstation ) desc1=$(nls "X workstation running GNOME") - size=$(nls '581MB with default set of packages') + size=$(nls '500MB with default set of packages') ;; kde-workstation ) desc1=$(nls "X workstation running KDE") - size=$(nls '526MB with default set of packages') + size=$(nls '442MB with default set of packages') ;; icewm-workstation ) desc1=$(nls "X workstation running IceWM") - size=$(nls '390MB with default set of packages') + size=$(nls '326MB with default set of packages') ;; wmaker-workstation ) desc1=$(nls "X workstation running WindowMaker") + size=$(nls '344MB with default set of packages') + ;; + xfce-workstation ) +desc1=$(nls "X workstation running XFCE") size=$(nls '408MB with default set of packages') ;; MINI-ISO ) desc1=$(nls "Limited version of base installation") desc2=$(nls "Select this if you're installing from MINI-ISO") - size=$(nls '170MB with docs, all locales') + size=$(nls '139MB with docs, all locales') ;; LAST ) desc1=$(nls "Packages, you have selected last time.") ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit