diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-06-25 08:12:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-06-25 08:12:19 +0000 |
| commit | 5f99e9af89f49db6f8144a5327dfadf84acc25a0 (patch) | |
| tree | 55359d8403d41603e7897eb1af1ee53c15632d4c /perl-install | |
| parent | d4076527d38c031a08b63f35616ce2fc5aeadd8c (diff) | |
| download | drakx-5f99e9af89f49db6f8144a5327dfadf84acc25a0.tar drakx-5f99e9af89f49db6f8144a5327dfadf84acc25a0.tar.gz drakx-5f99e9af89f49db6f8144a5327dfadf84acc25a0.tar.bz2 drakx-5f99e9af89f49db6f8144a5327dfadf84acc25a0.tar.xz drakx-5f99e9af89f49db6f8144a5327dfadf84acc25a0.zip | |
fix blino stage1 change (i think he likes breaking things ;p)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index bc15d0f90..f829063c1 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -993,7 +993,7 @@ sub generate_automatic_stage1_params { } elsif ($o->{method} eq 'ftp') { @ks = (server => $ENV{HOST}, directory => $ENV{PREFIX}, user => $ENV{LOGIN}, pass => $ENV{PASSWORD}); } elsif ($o->{method} eq 'nfs') { - cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/image nfs| or die; + cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/nfsimage| or die; @ks = (server => $1, directory => $2); } @ks = (method => $method, @ks); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index ededc1821..76afb301c 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -213,7 +213,7 @@ sub doPartitionDisksAfter { grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}}; } - cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/image nfs| && + cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/nfsimage| && !any { $_->{mntpoint} eq "/mnt/nfs" } @{$o->{all_hds}{nfss}} and push @{$o->{all_hds}{nfss}}, { type => 'nfs', mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,soft,rsize=8192,wsize=8192" }; } |