no_comment

4 files changed, 60 insertions, 8 deletions

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 4c7cbc469..b891f5f10 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -170,7 +170,7 @@ sub mount_all($;$) {
     log::l("mounting all filesystems");
 
     # order mount by alphabetical ordre, that way / < /home < /home/httpd...
-    foreach (sort { $a->{mntpoint} cmp $b->{mntpoint} } @$fstab) {
+    foreach (sort { ($a->{mntpoint} || '') cmp ($b->{mntpoint} || '') } @$fstab) {
 	mount_part($_, $prefix) if ($_->{mntpoint} || isSwap($_));
     }
 }
diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
new file mode 100644
index 000000000..e6c27e68c
--- /dev/null
+++ b/perl-install/ftp.pm
@@ -0,0 +1,49 @@
+package ftp;
+
+use Net::FTP;
+
+use install_any;
+use log;
+
+# non-rentrant!!
+
+my %options = (Passive => 1);
+$options{Firewall} = $ENV{PROXY} if $ENV{PROXY};
+$options{Port} = $ENV{PROXYPORT} if $ENV{PROXYPORT};
+my @l;
+unless ($ENV{HOST}) {
+    # must be in kickstart, using URLPREFIX to find out information
+    ($ENV{LOGIN}, $ENV{PASSWORD}, $ENV{HOST}, $ENV{PREFIX}) = @l =
+      $ENV{URLPREFIX} =~ m|
+       ://
+       (?: ([^:]*)              # login
+           (?: :([^@]*))?       # password
+       @)?
+       ([^/]*)                	# host
+       /?(.*)			# prefix
+      |x;
+}
+unless ($ENV{LOGIN}) {
+    $ENV{LOGIN} = 'anonymous';
+    $ENV{PASSWORD} = 'mdkinst@test';
+}
+
+my $host = $ENV{HOST};
+if ($host !~ /^[.\d]+$/) {
+    $host = join ".", unpack "C4", (gethostbyname $host)[4];
+    print ">>>>> $host <<<<<<\n";
+}
+
+my $ftp = Net::FTP->new($host, %options) or die;
+$ftp->login($ENV{LOGIN}, $ENV{PASSWORD}) or die;
+$ftp->binary;
+
+my $retr;
+
+1;
+
+
+sub getFile($) {
+    $retr->close if $retr;
+    $retr = $ftp->retr($ENV{PREFIX} . "/" . install_any::relGetFile($_[0]));
+}
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e62df278f..dbe71e300 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -48,8 +48,8 @@ customized installation, this Install Class is for you."),
 
 setupSCSI => 
  __("The system did not detect a SCSI card. If you have one (or several)
-click on \"Yes\" and choose the module(s)
-to be tested. Otherwise, select \"Not\".
+click on \"Yes\" and choose the module(s) to be tested. Otherwise, 
+select \"No\".
 
 If you don't know if your computer has SCSI interfaces, consult the
 original documentation delivered with the computer, or if you use
@@ -74,7 +74,7 @@ formatPartitions =>
 use. At this time, you may wish to re-format some pre-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. Typical examples: /home and /usr/local."),
+data you wish to keep. Typically retained are: /home and /usr/local."),
 
 choosePackages => 
  __("You may now select the packages you wish to install.
@@ -86,7 +86,7 @@ installation configuration. It is impossible to install a package
 without installing all of its dependencies.
 
 Information on each category and specific package is available in the
-area titled \"Info\". This is located above buttons: [confirmation]
+area titled \"Info\". This is located above the buttons: [confirmation]
 [selection] [deselection]."),
 
 doInstallStep => 
@@ -129,8 +129,8 @@ addUser =>
  __("You can now authorize one or more people to be use your Linux
 system. Each user account will have their own customizable environment.
 
-It is very important that you create at least one user, even if there
-will only be one principle user of the system. The administrative
+It is very important that you create a regular user account, even if 
+there will only be one principle user of the system. The administrative
 \"root\" account should not be used for day to day operation of the
 computer.  It is a security risk.  The use of a regular user account
 protects you and the system from yourself. The root account should only
@@ -150,7 +150,8 @@ drive\"."),
 configureX => 
  __("It is now time to configure the video card and monitor
 configuration for the X windows Graphic User Interface (GUI). First
-select you monitor. Next, you may test the configuration and change your
+select your monitor. Next, you may test the configuration and change
+your
 selections if necessary."),
 
 exitInstall =>
diff --git a/perl-install/share/list b/perl-install/share/list
index 315d7012e..14862552a 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -2,6 +2,8 @@
 /bin/cpio
 /lib/libnss_nis.so.2
 /lib/libnss_files.so.2
+/lib/libnss_dns.so.2
+/lib/libresolv.so.2
 /etc/protocols
 /sbin/insmod
 /sbin/mkdosfs