diff options
| -rw-r--r-- | perl-install/ChangeLog | 6 | ||||
| -rw-r--r-- | perl-install/any.pm | 5 | ||||
| -rw-r--r-- | perl-install/commands.pm | 1 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 1 | ||||
| -rw-r--r-- | perl-install/help.pm | 561 | ||||
| -rw-r--r-- | perl-install/install_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_interactive.pm | 8 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 30 |
9 files changed, 400 insertions, 217 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index ab75445ee..2c3159b47 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,9 @@ +2000-09-26 Pixel <pixel@mandrakesoft.com> + + * commands.pm (bug): add ddcxinfos + + * pci_probing/pcitable: replace tulip by de4x5 for 2104x cards + 2000-09-26 François Pons <fpons@mandrakesoft.com> * Xconfigurator.pm: added more 3D Rage Pro card for 3D diff --git a/perl-install/any.pm b/perl-install/any.pm index f6220f4bb..c9cace407 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -502,7 +502,10 @@ sub setup_thiskind { my $opt = [ __("Yes"), __("No") ]; push @$opt, __("See hardware info") if $::expert; my $r = "Yes"; - $r = $in->ask_from_list_('', $msg, $opt, "No") unless $at_least_one && @l == 0; + unless ($at_least_one && @l == 0) { + $::o->set_help('setupSCSIChoose') if $::isInstall; + $r = $in->ask_from_list_('', $msg, $opt, "No"); + } if ($r eq "No") { return @l } if ($r eq "Yes") { push @l, load_module($in, $type) || next; diff --git a/perl-install/commands.pm b/perl-install/commands.pm index 311b204f2..6a6869a0a 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -583,6 +583,7 @@ sub bug { header("partitions"), cat_("/proc/partitions"), header("cpuinfo"), cat_("/proc/cpuinfo"), header("syslog"), cat_("/tmp/syslog"), + header("ddcxinfos"), `ddcxinfos`, header("ddebug.log"), cat_("/tmp/ddebug.log"), header("install.log"), cat_("/mnt/root/install.log"), ; diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 126897889..af1882186 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -28,7 +28,6 @@ my @suggestions = ( { mntpoint => "/home", size => 50 << 11, type => 0x83, ratio => 3 }, { mntpoint => "/var", size => 200 << 11, type => 0x83, ratio => 1, maxsize =>1000 << 11 }, { mntpoint => "/tmp", size => 50 << 11, type => 0x83, ratio => 3, maxsize => 500 << 11 }, - { mntpoint => "/mnt/iso", size => 700 << 11, type => 0x83 }, ); my @suggestions_mntpoints = ( "/root/", arch() =~ /sparc/ ? "/mnt/sunos" : "/mnt/windows" ); diff --git a/perl-install/help.pm b/perl-install/help.pm index c8b299018..e6ff5342b 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -6,30 +6,44 @@ use common qw(:common); empty => '', selectLanguage => -__("Choose preferred language for install and system usage."), +__("Please choose your preferred language for installation and system usage."), -selectKeyboard => - __("Choose the layout corresponding to your keyboard from the list above"), +license => +__("You need to accept the terms of the above license to continue installation. -selectInstallClass => - __("Choose \"Install\" if there are no previous versions of GNU/Linux -installed, or if you wish to use multiple distributions or versions. +Please click on \"Accept\" if you are agree with its terms. -Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake already installed. +Please click on \"Refuse\" if you disagree with its terms. Installation will end without modifying your current +configuration."), +selectKeyboard => +__("Choose the layout corresponding to your keyboard from the list above"), -Select: +selectLangs => +__("If you wish other languages (than the one you choose at +beginning of installation) will be available after installation, please chose +them in list above. If you want select all, you just need to select \"All\"."), - - Recommended: If you have never installed GNU/Linux before, choose this. +selectInstallClass => +__("Please choose \"Install\" if there are no previous version of Linux-Mandrake +installed or if you wish to use several operating systems. - - Customized: If you are familiar enough with GNU/Linux, you may then choose - the primary usage for your machine. See below for details. +Please choose \"Rescue\" if you wish to rescue an already installed version of Linux-Mandrake. - - Expert: This supposes that you are fluent with GNU/Linux and want to - perform a highly customized installation. As for a \"Customized\" - installation class, you will be able to select the usage for your system. - But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE DOING! -"), #-'5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold 2000', '7.0 (Air)' ], +Depend of your knowledge in GNU/Linux, you can choose one of the following levels to install or rescue your +Linux-Mandrake operating system: + * Recommanded: if you have never installed a GNU/Linux operating system choose this. Installation will be + be very easy and you will be asked only on few questions. + + * Customized: if you are familiar enough with GNU/Linux, you may choose the primary usge (workstation, server, + development) of your sytem. You will need to answer to more questions than in \"Recommanded\" installation + class, so you need to know how works GNU/Linux to choose this installation class. + + * Expert: if you have a good knowledge in GNU/Linux, you can choose this installation class. As in \"Customized\" + installation class, you will be able to choose the primary usage (workstation, server, development). Be very + careful before choose this installation class. You will be able to perform a higly customized installation. + Answer to some questions can be very difficult if you haven't a good knowledge in GNU/Linux. So, don't choose + this installation class unless you know what you are doing."), selectInstallClassCorpo => __("Select: @@ -40,181 +54,300 @@ selectInstallClassCorpo => - Expert: This supposes that you are fluent with GNU/Linux and want to perform a highly customized installation. As for a \"Customized\" installation class, you will be able to select the usage for your system. - But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE DOING! -"), + But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE DOING!"), selectInstallClass2 => -__("The different choices for your machine's usage (provided, hence, that you have -chosen either \"Custom\" or \"Expert\" as an installation class) are the -following: +__("You must now define your machine usage. Choices are: + * Workstation: this the ideal choice if you intend to use your machine primarily for everyday use, at office or + at home. + + * Development: if you intend to use your machine primarily for software development, it is the good choice. You + will then have a complete collection of software installed in order to compile, debug and format source code, + or create software packages. + + * Server: if you intend to use this machine as a server, it is the good choice. Either a file server (NFS or + SMB), a print server (Unix style or Microsoft Windows style), an authentication server (NIS), a database + server and so on. As such, do not expect any gimmicks (KDE, GNOME, etc.) to be installed."), + +setupSCSI => __("DrakX will attempt to look for PCI SCSI adapter(s). If DrakX +finds an SCSI adapter and knows which driver to use, it will be automatically +installed. + +If you have no SCSI adapter, an ISA SCSI adapter or a PCI SCSI adapter that +DrakX doesn't recognize, you will be asked if a SCSI adapter is present in your +system. If there is no adapter present, you can click on \"No\". If you click on +\"Yes\", a list of drivers will be presented from which you can select your +specific adapter. + +If you have to manually specify your adapter, DrakX will ask if you want to +specify options for it. You should allow DrakX to probe the hardware for the +options. This usually works well. + +If not, you will need to provide options to the driver. Please review the User +Guide (chapter 3, section \"Collective informations on your hardware) for hints +on retrieving this information from hardware documentation, from the +manufacturer's Web site (if you have Internet access) or from Microsoft Windows +(if you have it on your system)."), + +setupSCSIChoose => __("Please choose a driver for your SCSI adapter."), + +doPartitionDisks => __("At this point, you need to choose where to install your +Linux-Mandrake operating system on your hard drive. If it is empty or if an +existing operating system uses all the space available on it, you need to +partition it. Basically, partitioning a hard drive consists of logically +dividing it to create space to install your new Linux-Mandrake system. + +Because the effects of the partitioning process are usually irreversible, +partitioning can be intimidating and stressful if you are an inexperienced user. +This wizard simplifies this process. Before begining, please consult the manual +and take your time. + +You need at least two partitions. One is for the operating system itself and the +other is for the virtual memory (also called Swap). + +If partitions have been already defined (from a previous installation or from +another partitioning tool), you just need choose those to use to install your +Linux system. + +If partitions haven't been already defined, you need to create them. To do that, +use the wizard available above. Depending of your hard drive configuration, +several solutions can be available: + + * Use existing partition: the wizard has detected one or more existing Linux partitions on your hard drive. If + you want to keep them, choose this option. + + * Erase entire disk: if you want delete all data and +all partitions present on your hard drive and replace them by + your new Linux-Mandrake system, you can choose this option. Be careful with this solution, you will not be + able to revert your choice after confirmation. + + * Use the free space on the Windows partition: if Microsoft Windows is installed on your hard drive and takes + all space available on it, you have to create free space for Linux data. To do that you can delete your + Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert mode\" solutions) or resize your + Microsoft Windows partition. Resizing can be performed +without loss of any data. This solution is + recommended if you want use both Linux-Mandrake and Microsoft Windows on same computer. + + Before choosing this solution, please understand +that the size of your Microsoft + Windows partition will be smaller than at present time. It means that you will have less free space under + Microsoft Windows to store your data or install new software. + + * Expert mode: if you want to partition manually your hard drive, you can choose this option. Be careful before + choosing this solution. It is powerful but it is very dangerous. You can lose all your data very easily. So, + don't choose this solution unless you know what you are doing."), + +partition_with_diskdrake => __("At this point, you need to choose what +partition(s) to use to install your new Linux-Mandrake system. If partitions +have been already defined (from a previous installation of GNU/Linux or from +another partitioning tool), you can use existing partitions. In other cases, +hard drive partitions must be defined. + +To create partitions, you must first select a hard drive. You can select the +disk for partitioning by clicking on \"hda\" for the firs IDE drive, \"hdb\" for +the second or \"sda\" for the first SCSI drive and so on. + +To partition the selected hard drive, you can use these options: + * Clear all: this option deletes all partitions available on the selected hard drive. + + * Auto allocate:: this option allows you to automatically create Ext2 and swap partitions in free space of your + hard drive. + + * Rescue partition table: if your partition table is damaged, you can try to recover it using this option. Please + be careful and remember that it can fail. - - Normal: choose this if you intend to use your machine primarily for - everyday use (office work, graphics manipulation and so on). Do not - expect any compiler, development utility, etc. installed. + * Undo: you can use this option to cancel your changes. - - Development: as its name says, choose this if you intend to use your - machine primarily for software development. You will then have a complete - collection of software installed in order to compile, debug and format - source code, or create software packages. + * Reload: you can use this option if you wish to undo all changes and load your initial partitions table - - Server: choose this if the machine which you're installing Linux-Mandrake - on is intended to be used as a server. Either a file server (NFS or SMB), - a print server (Unix' lp (Line Printer) protocol or Windows style SMB - printing), an authentication server (NIS), a database server and so on. As - such, do not expect any gimmicks (KDE, GNOME...) to be installed. -"), + * Wizard: If you wish to use a wizard to partition your hard drive, you can use this option. It is recommended if + you do not have a good knowledge in partitioning. -setupSCSI => - __("DrakX will attempt to look for PCI SCSI adapter(s). -If DrakX finds a SCSI adapter and knows which driver to use it will -automatically install it (or them). + * Restore from floppy: if you have saved your partition table on a floppy during a previous installation, you can + recover it using this option. -If you have no SCSI adapter, an ISA SCSI adapter, or a -PCI SCSI adapter that DrakX doesn't recognize you will be asked if a -SCSI adapter is present in your system. If there is no adapter present -you can just click 'No'. If you click 'Yes' a list of drivers will be -presented from which you can select your specific adapter. + * Save on floppy: if you wish to save your partition table on a floppy to be able to recover it, you can use this + option. It is strongly recommended to use this option + * Done: when you have finished partitioning your hard drive, use this option to save your changes. -If you had to manually specify your adapter, DrakX will -ask if you want to specify options for it. You should allow DrakX to -probe the hardware for the options. This usually works well. +For information, you can reach any option using the keyboard: navigate trough the partitions using Tab and Up/Down + arrows. When a partition is selected, you can use: + * Ctrl-c to create a new partition (when a empty partition is selected) + * Ctrl-d to delete a partition + * Ctrl-m to set the mount point"), -If not, you will need to provide options to the driver. -Review the Installation Guide for hints on retrieving this -information from Windows (if you have it on your system), -from hardware documentation, or from the manufacturer's -website (if you have Internet access)."), +ask_mntpoint_s => __("Above are listed the existing Linux partitions detected on +your hard drive. You can keep choices make by the wizard, they are good for a +common usage. If you change these choices, you must at least define a root +partition (\"/\"). Don't choose a too little partition or you will not be able +to install enough software. If you want store your data on a separate partition, +you need also to choose a \"/home\" (only possible if you have more than one +Linux partition available). -doPartitionDisks => - __("At this point, you may choose what partition(s) to use to install -your Linux-Mandrake system if they have been already defined (from a -previous install of GNU/Linux or from another partitioning tool). In other -cases, hard drive partitions must be defined. This operation consists of -logically dividing the computer's hard drive capacity into separate -areas for use. +For information, each partition is listed as follows: \"Name\", \"Capacity\". +\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\", +\"partition number\" (for example, \"hda1\"). -If you have to create new partitions, use \"Auto allocate\" to automatically -create partitions for GNU/Linux. You can select the disk for partitioning by -clicking on \"hda\" for the first IDE drive, -\"hdb\" for the second or \"sda\" for the first SCSI drive and so on. +\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and \"sd\" +if it is an SCSI hard drive. +\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE hard drives: + * \"a\" means \"master hard drive on the primary IDE controller\", + * \"b\" means \"slave hard drive on the primary IDE controller\", + * \"c\" means \"master hard drive on the secondary IDE controller\", + * \"d\" means \"slave hard drive on the secondary IDE controller\". +With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means \"secondary hard drive\", etc..."), -Two common partition are: the root partition (/), which is the starting -point of the filesystem's directory hierarchy, and /boot, which contains -all files necessary to start the operating system when the -computer is first turned on. +takeOverHdChoose => __("Choose the hard drive you want to erase to install your +new Linux-Mandrake partition. Be careful, all data present on it will be lost +and will not be recoverable."), +takeOverHdConfirm => __("Click on \"OK\" if you want to delete all data and +partitions present on this hard drive. Be careful, after clicking on \"OK\", you +will not be able to recover any data and partitions present on this hard drive, +including any Windows data. -Because the effects of this process are usually irreversible, partitioning -can be intimidating and stressful to the unexperienced user. DiskDrake -simplifies the process so that it must not be. Consult the documentation -and take your time before proceeding. +Click on \"Cancel\" to cancel this operation without losing any data and +partitions present on this hard drive."), +resizeFATChoose => __("More than one Microsoft Windows partition have been +detected on your hard drive. Please choose the one you want resize to install +your new Linux-Mandrake operating system. -You can reach any option using the keyboard: navigate through the partitions -using Tab and Up/Down arrows. When a partition is selected, you can use: +For information, each partition is listed as follow; \"Linux name\", \"Windows +name\" \"Capacity\". -- Ctrl-c to create a new partition (when an empty partition is selected) +\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number\", +\"partition number\" (for example, \"hda1\"). -- Ctrl-d to delete a partition +\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd\" +if it is an SCSI hard drive. -- Ctrl-m to set the mount point -"), +\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With IDE hard drives: + * \"a\" means \"master hard drive on the primary IDE controller\", + * \"b\" means \"slave hard drive on the primary IDE controller\", + * \"c\" means \"master hard drive on the secondary IDE controller\", + * \"d\" means \"slave hard drive on the secondary IDE controller\". +With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means \"secondary hard drive\", etc. -formatPartitions => - __("Any partitions that have been newly defined must be formatted for -use (formatting meaning creating a filesystem). At this time, you may -wish to re-format some already existing partitions to erase the data -they contain. Note: it is not necessary to re-format pre-existing -partitions, particularly if they contain files or data you wish to keep. -Typically retained are /home and /usr/local."), +\"Windows name\" is the letter of your hard drive under Windows (the first disk +or partition is called \"C:\")."), -choosePackages => - __("You may now select the group of packages you wish to +resizeFATWait => __("Please be patient. This operation can take several minutes."), + +formatPartitions => __("Any partitions that have been newly defined must be +formatted for use (formatting meaning creating a filesystem). + +At this time, you may wish to reformat some already existing partitions to erase +the data they contain. If you wish do that, please also select the partitions +you want to format. + +Please note that it is not necessary to reformat all pre-existing partitions. +You must reformat the partitions containing the operating system (such as \"/\", +\"/usr\" or \"/var\") but do you no have to reformat partitions containing data +that you wish to keep (typically /home). + +Please be careful selecting partitions, after formatting, all data will be +deleted and you will not be able to recover any of them. + +Click on \"OK\" when you are ready to format partitions. + +Click on \"Cancel\" if you want to choose other partitions to install your new +Linux-Mandrake operating system."), + +choosePackages => __("You may now select the group of packages you wish to install or upgrade. DrakX will then check whether you have enough room to install them all. If not, -it will warn you about it. If you want to go on anyway, it will proceed onto -the installation of all selected groups but will drop some packages of lesser -interest. At the bottom of the list you can select the option -\"Individual package selection\"; in this case you will have to browse -through more than 1000 packages..."), +it will warn you about it. If you want to go on anyway, it will proceed onto the +installation of all selected groups but will drop some packages of lesser +interest. At the bottom of the list you can select the option \"Individual +package selection\"; in this case you will have to browse through more than 1000 +packages..."), + +choosePackagesTree => __("You can now choose individually all the packages you +wish to install. + +You can expand or collapse the tree by clicking on options in the left corner of +the packages window. -chooseCD => - __("If you have all the CDs in the list above, click Ok. -If you have none of those CDs, click Cancel. -If only some CDs are missing, unselect them, then click Ok."), +If you prefer to see packages sorted in alphabetic order, click on the icon +\"Toggle flat and group sorted\". -installPackages => - __("The packages selected are now being installed. This operation -should take a few minutes unless you have chosen to upgrade an -existing system, in that case it can take more time even before -upgrade starts."), +If you want not to be warned on dependencies, click on \"Automatic +dependencies\". If you do this, note that unselecting one package may silently +unselect several other packages which depend on it."), -selectMouse => - __("If DrakX failed to find your mouse, or if you want to -check what it has done, you will be presented the list of mice -above. +chooseCD => __("If you have all the CDs in the list above, click Ok. If you have +none of those CDs, click Cancel. If only some CDs are missing, unselect them, +then click Ok."), +installPackages => __("Your new Linux-Mandrake operating system is currently +installed. This operation should take a few minutes (it depends on size you +choose to install and the speed of your computer). -If you agree with DrakX's settings, just click 'Ok'. -Otherwise you may choose the mouse that more closely matches your own -from the menu above. +Please be patient."), +selectMouse => __( "You can now test your mouse. Use buttons and wheel to verify +if settings are good. If not, you can click on \"Cancel\" to choose another +driver."), -In case of a serial mouse, you will also have to tell DrakX -which serial port it is connected to."), +selectSerialPort => __("Please select the correct port. For example, the COM1 +port under MS Windows is named ttyS0 under GNU/Linux."), -selectSerialPort => - __("Please select the correct port. For example, the COM1 port under MS Windows -is named ttyS0 under GNU/Linux."), +configureNetwork => __("If you wish to connect your computer to the Internet or +to a local network please choose the correct option. Please turn on your device +before choosing the correct option to let DrakX detect it automatically. -configureNetwork => - __("This section is dedicated to configuring a local area -network (LAN) or a modem. +If you do not have any connection to the Internet or a local network, choose +\"Disable networking\". -Choose \"Local LAN\" and DrakX will -try to find an Ethernet adapter on your machine. PCI adapters -should be found and initialized automatically. -However, if your peripheral is ISA, autodetection will not work, -and you will have to choose a driver from the list that will appear then. +If you wish to configure the network later after installation or if you have +finished to configure your network connection, choose \"Done\"."), +configureNetworkNoModemFound => __("No modem has been detected. Please select +the serial port on which it is plugged. -As for SCSI adapters, you can let the driver probe for the adapter -in the first time, otherwise you will have to specify the options -to the driver that you will have fetched from documentation of your -hardware. +For information, the first serial port (called \"COM1\" under Mircrosoft +Windows) is called \"ttyS0\" under Linux."), +configureNetworkDNS => __("You may now enter dialup options. If you don't know +or are not sure what to enter, the correct informations can be obtained from +your Internet Service Provider. If you do not enter the DNS (name server) +information here, this information will be obtained from your Internet Service +Provider at connection time."), -If you install a Linux-Mandrake system on a machine which is part -of an already existing network, the network administrator will -have given you all necessary information (IP address, network -submask or netmask for short, and hostname). If you're setting -up a private network at home for example, you should choose -addresses. +configureNetworkISDN => __("If your modem is an external modem, please turn on +it now to let DrakX detect it automatically."), +configureNetworkADSL => __("Please turn on your modem and choose the correct one."), -Choose \"Dialup with modem\" and the Internet connection with -a modem will be configured. DrakX will try to find your modem, -if it fails you will have to select the right serial port where -your modem is connected to."), +configureNetworkADSL2 => __("If you are not sure if informations above are +correct or if you don't know or are not sure what to enter, the correct +informations can be obtained from your Internet Service Provider. If you do not +enter the DNS (name server) information here, this information will be obtained +from your Internet Service Provider at connection time."), -configureNetworkIP => - __("Enter: +configureNetworkCable => __("You may now enter your host name if needed. If you +don't know or are not sure what to enter, the correct informations can be +obtained from your Internet Service Provider."), - - IP address: if you don't know it, ask your network administrator or ISP. +configureNetworkIP => __("You may now configure your network device. +* IP address: if you don't know or are not sure what to enter, +ask your network administrator. You should not enter an IP address if +you select the option \"Automatic IP\" below. - - Netmask: \"255.255.255.0\" is generally a good choice. If you are not -sure, ask your network administrator or ISP. +* Netmask: \"255.255.255.0\" is generally a good choice. If you don't know or are not sure what to enter, ask your + network administrator. +* Automatic IP: if your network uses BOOTP or DHCP protocol, select this option. If selected, no value is needed in + \"IP address\". If you don't know or are not sure if you need to select this option, ask your network administrator."), - - Automatic IP: If your network uses BOOTP or DHCP protocol, select -this option. If selected, no value is needed in \"IP address\". If you are -not sure, ask your network administrator or ISP. -"), +configureNetworkHost => __("You may now enter your host name if needed. If you +don't know or are not sure what to enter, ask yout network administrator."), configureNetworkISP => __("You may now enter dialup options. If you're not sure what to enter, the @@ -233,65 +366,87 @@ Note you have to select mirror and cryptographic packages according to your legislation."), configureTimezone => - __("You can now select your timezone according to where you live. + __("You can now select your timezone according to where you live."), +configureTimezoneGMT => __("GNU/Linux manages time in GMT (Greenwich Manage +Time) and translates it in local time according to the time zone you have +selected. -GNU/Linux manages time in GMT or \"Greenwich Mean Time\" and translates it -in local time according to the time zone you have selected."), +If you use Microsoft Windows on this computer, choose \"No\"."), configureServices => - __("You may now choose which services you want to see started at boot time. + __("You may now choose which services you want to start at boot time. + When your mouse comes over an item, a small balloon help will popup which describes the role of the service. -Be especially careful in this step if you intend to use your machine as a -server: you will probably want not to start any services that you don't -want."), +Be very careful in this step if you intend to use your machine as a server: you +will probably want not to start any services that you don't need. Please +remember that several services can be dangerous if they are enable on a server. +In general, select only the services that you really need."), + +configurePrinter => __("You can configure a local printer (connected to your +computer) or remote printer (accessible via a Unix, Netware or Microsoft Windows +network)."), -configurePrinter => - __("GNU/Linux can deal with many types of printer. Each of these -types require a different setup. Note however that the print -spooler uses 'lp' as the default printer name; so you -must have one printer with such a name; but you can give -several names, separated by '|' characters, to a printer. -So, if you prefer to have a more meaningful name you just have -to put it first, eg: \"My Printer|lp\". -The printer having \"lp\" in its name(s) will be the default printer. +configurePrinterSystem => __(" +If you wish to be able to print, please choose one printing system between CUPS and LPR. +CUPS is a new, powerful and flexible printing system for Unix systems (CUPS +means \"Common Unix Printing System\"). It is the default printing system in +Linux-Mandrake. -If your printer is physically connected to your computer, select -\"Local printer\". You will then have to tell which port your -printer is connected to, and select the appropriate filter. +LPR is the old printing system used in previous Linux-Mandrake distributions. +If you don't have printer, click on \"None\"."), -If you want to access a printer located on a remote Unix machine, -you will have to select \"Remote lpd\". In order to make -it work, no username or password is required, but you will need -to know the name of the printing queue on this server. +configurePrinterConnected => +__("GNU/Linux can deal with many types of printer. Each of these types require a different setup. +If your printer is physically connected to your computer, select \"Local printer\". -If you want to access a SMB printer (which means, a printer located -on a remote Windows 9x/NT machine), you will have to specify its -SMB name (which is not its TCP/IP name), and possibly its IP address, -plus the username, workgroup and password required in order to -access the printer, and of course the name of the printer. The same goes -for a NetWare printer, except that you need no workgroup information."), +If you want to access a printer located on a remote Unix machine, select \"Remote printer\". -setRootPassword => - __("You can now enter the root password for your Linux-Mandrake -system. The password must be entered twice to verify that both +If you want to access a printer located on a remote Microsoft Windows machine +(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."), + +configurePrinterLocal => __("Please turn on your printer before continue if you +wish DrakX try to detect it. + +You need to enter some informations here. + * Name of printer: the print spooler uses \"lp\" as default printer name. So, you need have a printer named \"lp\". + If you have only one printer, you can use several names for it. You just need to separate them by a pipe + character (a \"|\"). So, if you prefer to have a more meaningful name, you have to put it first, eg: \"My printer|lp\". + The printer having \"lp\" in its name(s) will be the default printer. + + * Description: this optional but can be useful if several printers are connected on your computer or if you allow + other computers to access to this printer. + + * Location: if you want to put some informations on where is your printer, put them here (you are free to write what + you want)."), + +configurePrinterDev => __("Your printer have not been detected. Please enter +name of device on which it is connected. + +For information, most of printers are connecter on first paralell port. This one +is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft Windows."), + +configurePrinterType => __("You now need to select your printer in list above."), + +setRootPassword => __("You can now enter the root password for your +Linux-Mandrake system. The password must be entered twice to verify that both password entries are identical. +Root is the system's administrator and is the only user allowed to modify the +system configuration. Therefore, choose this password carefully. Unhautorized +use of the root account can be extemely dangerous to the integrity of the +system, its data and other system connected to it. -Root is the administrator of the system, and is the only user -allowed to modify the system configuration. Therefore, choose -this password carefully! Unauthorized use of the root account can -be extremely dangerous to the integrity of the system and its data, -and other systems connected to it. The password should be a -mixture of alphanumeric characters and a least 8 characters long. It -should NEVER be written down. Do not make the password too long or -complicated, though: you must be able to remember without too much -effort."), +The password should be a mixture of alphanumeric characters and at least 8 +characters long. It should never be written down. + +Do not make the password too long or complicated, though: you must be able to +remember it without too much effort."), setRootPasswordMd5 => __("To enable a more secure system, you should select \"Use shadow file\" and @@ -320,11 +475,8 @@ Therefore, you should connect to the system using the user account you will have created here, and login as root only for administration and maintenance purposes."), -createBootdisk => - __("It is strongly recommended that you answer \"Yes\" here. If you install -Microsoft Windows at a later date it will overwrite the boot sector. -Unless you have made a bootdisk as suggested, you will not be able to -boot into GNU/Linux any more."), +createBootdisk => __("Creating a boot disk is strongly recommended. If you can't +boot your computer, it's the only way to rescue it without reinstalling it."), setupBootloaderBeginner => __("You need to indicate where you wish @@ -418,27 +570,26 @@ configureXxdm => miscellaneous => __("You can now select some miscellaneous options for your system. - - Use hard drive optimizations: this option can improve hard disk performance - but is only for advanced users: some buggy chipsets can ruin your data, so - beware. Note that the kernel has a builtin blacklist of drives and - chipsets, but if you want to avoid bad surprises, leave this option unset. +* Use hard drive optimizations: this option can improve hard disk performance but is only for advanced users. Some buggy + chipsets can ruin your data, so beware. Note that the kernel has a builtin blacklist of drives and chipsets, but if + you want to avoid bad surprises, leave this option unset. + +* Choose security level: you can choose a security level for your system. Please refer to the manual for complete + information. Basically, if you don't know what to choose, keep the default option. - - Choose security level: you can choose a security level for your - system. Please refer to the manual for complete information. Basically: if - you don't know, select \"Medium\". +* Precise RAM if needed: unfortunately, there is no standard method to ask the BIOS about the amount of RAM present in + your computer. As consequence, Linux may fail to detect your amount of RAM correctly. If this is the case, you can + specify the correct amount or RAM here. Please note that a difference of 2 or 4 MB between detected memory and memory + present in your system is normal. - - Precise RAM size if needed: unfortunately, in today's PC world, there is no - standard method to ask the BIOS about the amount of RAM present in your - computer. As a consequence, GNU/Linux may fail to detect your amount of RAM - correctly. If this is the case, you can specify the correct amount of RAM - here. Note that a difference of 2 or 4 MB is normal. +* Removable media automounting: if you would prefer not to manually mount removable media (CD-Rom, floppy, Zip, etc.) by + typing \"mount\" and \"umount\", select this option. - - Removable media automounting: if you would prefer not to manually - mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and - \"umount\", select this option. +* Clean \"/tmp\" at each boot: if you want delete all files and directories stored in \"/tmp\" when you boot your system, + select this option. - - Enable NumLock at startup: if you want NumLock enabled after booting, - select this option (Note: NumLock may or may not work under X)."), +* Enable num lock at startup: if you want NumLock key enabled after booting, select this option. Please note that you + should not enable this option on laptops and that NumLock may or may not work under X."), exitInstall => __("Your system is going to reboot. diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 29463c051..ce7aeb537 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -426,7 +426,9 @@ sub test_mouse { $w->sync; # HACK $draw_rect->(1, 0, [ 0, 0, $width, $height]); $draw_text->(_("Please test the mouse"), 2 * $bh - 20); - $draw_text->(_("Move your wheel!"), 2 * $bh + 10) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; + $draw_text->(_("To activate the mouse,"), 2 * $bh + 10) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; + $draw_text->(_("MOVE YOUR WHEEL!"), 2 * $bh + 20) if $mouse->{XMOUSETYPE} eq 'IMPS/2'; + $paintButton->($_, 0) foreach 0..2; $w->{cancel}->grab_focus; # my $timeout = Gtk->timeout_add(1000, sub { if ($time-- == 0) { log::l("timeout test_mouse"); undef $w->{retval}; Gtk->main_quit } 1 }); diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 115275634..da5939c34 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -27,6 +27,8 @@ You can find some information about them at: %s", join(", ", @l))) if @l; sub partition_with_diskdrake { my ($o, $hds, $nowizard) = @_; my $ok; + + $o->set_help('partition_with_diskdrake'); do { $ok = 1; require diskdrake; @@ -98,7 +100,9 @@ sub partitionWizardSolutions { $solutions{resize_fat} = [ 6 - @fats, _("Use the free space on the Windows partition"), sub { + $o->set_help('resizeFATChoose'); my $part = $o->ask_from_listf('', _("Which partition do you want to resize?"), \&partition_table_raw::description, \@ok_forloopback) or return; + $o->set_help('resizeFATWait'); my $w = $o->wait_message(_("Resizing"), _("Computing Windows filesystem bounds")); my $resize_fat = eval { resize_fat::main->new($part->{device}, devices::make($part->{device})) }; $@ and die _("The FAT resizer is unable to handle your partition, @@ -143,8 +147,10 @@ When sure, press Ok.")) or return; $solutions{wipe_drive} = [ 10, fsedit::is_one_big_fat($hds) ? _("Remove Windows(TM)") : _("Erase entire disk"), sub { + $o->set_help('takeOverHdChoose'); my $hd = $o->ask_from_listf('', _("You have more than one hard drive, which one do you install linux on?"), \&partition_table_raw::description, $hds) or return; + $o->set_help('takeOverHdConfirm'); $o->ask_okcancel('', _("ALL existing partitions and their data will be lost on drive %s", partition_table_raw::description($hd))) or return; partition_table_raw::zero_MBR($hd); fsedit::auto_allocate($hds, $o->{partitions}); @@ -177,6 +183,8 @@ When you are done, don't forget to save using `w'", partition_table_raw::descrip sub partitionWizard { my ($o, $nodiskdrake) = @_; + $o->set_help('doPartitionDisks'); + my %solutions = partitionWizardSolutions($o, $o->{hds}, $o->{fstab}, $o->{partitioning}{readonly}); %solutions = (loopback => $solutions{loopback}) if $o->{lnx4win}; delete $solutions{diskdrake} if $nodiskdrake; diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index a82e84d60..1b0e1ae56 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -243,6 +243,7 @@ a percentage of %d%% will install as many packages as possible.", $percentage, $ sub choosePackagesTree { my ($o, $packages, $compss) = @_; + $o->set_help('choosePackagesTree'); my ($curr, $parent, $info_widget, $w_size, $go, $idle, $flat, $auto_deps); my (%wtree, %ptree); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 8a2c9ea71..79a9e07c6 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -65,9 +65,12 @@ will be installed, you will be able to at least read and write in that language; and possibly more (various fonts, spell checkers, various programs translated etc. that varies from language to language).") if $o->{lang} !~ /^en/ && translate("_I18N_"); - $o->{useless_thing_accepted} = $o->ask_from_list_('', - "License - no warranty", - [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or $o->exit unless $o->{useless_thing_accepted}; + unless ($o->{useless_thing_accepted}) { + $o->set_help('license'); + $o->{useless_thing_accepted} = $o->ask_from_list_('', + "License - no warranty", + [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or $o->exit; + } } #------------------------------------------------------------------------------ sub selectKeyboard($) { @@ -81,6 +84,7 @@ sub selectKeyboard($) { delete $o->{keyboard_unsafe}; if ($::expert && ref($o) !~ /newt/) { #- newt is buggy with big windows :-( + $o->set_help('selectLangs'); $o->{langs} ||= []; my $all = $o->{langs}[0] eq 'all'; $o->{langs} = $o->ask_many_from_list('', @@ -200,15 +204,18 @@ sub setupSCSI { sub ask_mntpoint_s { my ($o, $fstab) = @_; + $o->set_help('ask_mntpoint_s'); + my @fstab = grep { isTrueFS($_) } @$fstab; @fstab = grep { isSwap($_) } @$fstab if @fstab == 0; @fstab = @$fstab if @fstab == 0; die _("no available partitions") if @fstab == 0; - - install_any::suggest_mount_points($o->{hds}, $o->{prefix}, 'uniq'); - log::l("default mntpoint $_->{mntpoint} $_->{device}") foreach @fstab; - + { + my $w = $o->wait_message('', _("Scanning partitions to find mount points")); + install_any::suggest_mount_points($o->{hds}, $o->{prefix}, 'uniq'); + log::l("default mntpoint $_->{mntpoint} $_->{device}") foreach @fstab; + } if (@fstab == 1) { $fstab[0]{mntpoint} = '/'; } else { @@ -299,9 +306,10 @@ sub choosePartitionsToFormat($$) { #- ok now we can really set toFormat $_->{toFormat} = 1 foreach @$toFormat; - $o->ask_many_from_list('', _("Check bad blocks?"), + my @m = grep { $_->{toFormat} && !isLoopback($_) && !isReiserfs($_) } @l; + @m && $o->ask_many_from_list('', _("Check bad blocks?"), { - list => [ grep { $_->{toFormat} && !isLoopback($_) && !isReiserfs($_) } @l ], + list => \@m, label => $name2label, ref => sub { \$_->{toFormatCheck} }, }) or goto &choosePartitionsToFormat if $::expert; @@ -377,6 +385,7 @@ sub choosePackages { $l[2] > $l[1] + 200 or splice(@l, 1, 1); #- not worth proposing too alike stuff $l[1] > $l[0] + 100 or splice(@l, 0, 1); } + $o->set_help('empty'); $o->ask_from_listf('', _("Select the size you want to install"), sub { _ ($text[$_[1]], $_[0]) }, \@l, $l[1]) * sqr(1024); } else { $o->chooseSizeToInstall($packages, $min_size, $max_size, $availableC, $individual) || goto &choosePackages; @@ -588,6 +597,7 @@ sub configureTimezone { require timezone; $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}); + $o->set_help('configureTimezoneGMT'); $o->{timezone}{UTC} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{UTC}) if $::expert || $clicked; install_steps::configureTimezone($o, $f); } @@ -625,11 +635,13 @@ sub configurePrinter { #- in case this has not be detected above. $::expert or $o->{printer}{mode} ||= 'CUPS'; if ($::expert || !$o->{printer}{mode}) { + $o->set_help('configurePrinterSystem'); $o->{printer}{mode} = $o->ask_from_list_([''], _("Which printing system do you want to use?"), [ 'CUPS', 'lpr', __("None") ], ); $o->{printer}{want} = $o->{printer}{mode} ne 'None'; $o->{printer}{want} or $o->{printer}{mode} = undef, return; + $o->set_help('configurePrinter'); } $o->{printer}{PAPERSIZE} = $o->{lang} eq 'en' ? 'letter' : 'a4'; |