summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-19 18:03:44 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-19 18:03:44 +0000
commitdba7d6225b48096fb2831bf36179123b16c67575 (patch)
treef5b28d8d7fb0af0e9ecc62f725c71f1cc47b5711
parentc0611b612c6d5dcf66e6441dd2824eebdec329e5 (diff)
downloaddrakx-backup-do-not-use-dba7d6225b48096fb2831bf36179123b16c67575.tar
drakx-backup-do-not-use-dba7d6225b48096fb2831bf36179123b16c67575.tar.gz
drakx-backup-do-not-use-dba7d6225b48096fb2831bf36179123b16c67575.tar.bz2
drakx-backup-do-not-use-dba7d6225b48096fb2831bf36179123b16c67575.tar.xz
drakx-backup-do-not-use-dba7d6225b48096fb2831bf36179123b16c67575.zip
no_comment
-rw-r--r--perl-install/help.pm21
-rw-r--r--perl-install/partition_table_raw.pm1
2 files changed, 10 insertions, 12 deletions
diff --git a/perl-install/help.pm b/perl-install/help.pm
index f57716e08..6a5022b12 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -20,17 +20,14 @@ Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
selectInstallClass =>
__("Select:
- - Beginner: If you have never installed Linux before, and wish to
-install the distribution elected \"Product of the year\" for 1999,
-click here.
+ - Beginner: If you have never installed Linux before, click here.
- Developer: If you are familiar with Linux and will be using the
computer primarily for software development, you will find happiness
here.
- - Server: If you wish to install a general purpose server, or the
-Linux distribution elected \"Distribution/Server\" for 1999, select
-this.
+ - Server: If you wish to install a general purpose server (for mail,
+printing...), select this.
- Expert: If you are fluent with GNU/Linux and want to perform
a highly customized installation, this Install Class is for you."),
@@ -52,9 +49,9 @@ want to specify options for it. First, try and let the driver
probe for the hardware: it usually works fine.
If not, do not forget the information on your hardware that you
-could get from Windows (if you have it on your system), as
-suggested by the installation guide. These are the options
-you will need to provide to the driver."),
+could get from your documentation or from Windows (if you have it
+on your system), as suggested by the installation guide. These
+are the options you will need to provide to the driver."),
partitionDisks =>
__("At this point, hard drive partitions must be defined. (Unless you
@@ -283,9 +280,9 @@ want to specify options for it. First, try and let the driver
probe for the hardware: it usually works fine.
If not, do not forget the information on your hardware that you
-could get from Windows (if you have it on your system), as
-suggested by the installation guide. These are the options
-you will need to provide to the driver."),
+could get from you documentation or from Windows (if you have
+it on your system), as suggested by the installation guide.
+These are the options you will need to provide to the driver."),
partitionDisks =>
__("At this point, hard drive partitions must be defined. (Unless you
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index dc2715745..b73b43590 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -27,6 +27,7 @@ my @MBR_signatures = (
);
sub typeOfMBR($) { typeFromMagic(devices::make($_[0]), @MBR_signatures) }
+sub typeOfMBR_($) { typeFromMagic($_[0], @MBR_signatures) }
sub compute_CHS($$) {
my ($hd, $e) = @_;