diff options
| -rw-r--r-- | docs/TODO | 4 | ||||
| -rw-r--r-- | perl-install/ChangeLog | 21 | ||||
| -rwxr-xr-x | perl-install/g_auto_install | 2 | ||||
| -rw-r--r-- | perl-install/help.pm | 12 | ||||
| -rw-r--r-- | perl-install/install2.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 21 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 |
9 files changed, 57 insertions, 16 deletions
@@ -8,6 +8,8 @@ partition is Ok (fixme? allow primary partition inside extended one, but with warning on diskdrake startup, made them as warning ?). -features------------------------------------------------------------------------------- +add rpmdrake in menu + (NEED 7.1) auto-install for corporate, very important (need consolidation). (7.1 or later) clean SCSI CDROM autoboot. @@ -48,6 +50,8 @@ ability to add nfs/weird_fs entries in fstab -to test-------------------------------------------------------------------------------- what's lseek64? +ensure installClass is set to something in auto install. + for axp, swriteboot -f1 if swriteboot failed. axp with swap part sigsegv diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index aa2ff266b..7e9189cf8 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,24 @@ +2000-05-02 Pixel <pixel@mandrakesoft.com> + + * g_auto_install: add $dir/lib to LD_LIBRARY_PATH (it was silly + not to have it) + +2000-05-01 Pixel <pixel@mandrakesoft.com> + + * install_steps_interactive.pm (setRootPassword): remove + NIS_server, use NIS instead + * install_any.pm (setAuthentication): remove NIS_server, use NIS instead + + * standalone/rpmdrake (AddMedia): hdlist.cz2 instead of hdlist + +2000-04-28 Pixel <pixel@mandrakesoft.com> + + * install_steps.pm (afterInstallPackages): fix yet another bug for + ttf from windobe handling + + * install_steps_interactive.pm (selectInstallClass): hide beginner + mode in corporate. Display special help. + 2000-04-29 Pablo Saratxaga <pablo@mandrakesoft.com> * my_gtk.pm: added call to Gtk->init; that makes 16 bit locales diff --git a/perl-install/g_auto_install b/perl-install/g_auto_install index 24185b6ae..ce19f9637 100755 --- a/perl-install/g_auto_install +++ b/perl-install/g_auto_install @@ -5,7 +5,7 @@ chomp $dir; $dir .= "/../../.."; $ENV{PERL5LIB} = join ":", map { "$dir/$_" } @INC; -$ENV{LD_LIBRARY_PATH} = "$dir/usr/lib"; +$ENV{LD_LIBRARY_PATH} = "$dir/lib:$dir/usr/lib"; $ENV{PATH} = join(":", map { "$dir/$_" } split ":", "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin") . ":$ENV{PATH}"; $ENV{SHARE_PATH} = "$dir/usr/share"; diff --git a/perl-install/help.pm b/perl-install/help.pm index 909d8495c..13c80d418 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -34,6 +34,18 @@ selectInstallClass => But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE DOING! "), +selectInstallClassCorpo => + __("Select: + + - Customized: If you are familiar enough with GNU/Linux, you may then choose + the primary usage for your machine. See below for details. + + - 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! +"), + 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 diff --git a/perl-install/install2.pm b/perl-install/install2.pm index a69b02e3e..93d4e44a4 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -559,6 +559,7 @@ sub main { (my $root = `/bin/pwd`) =~ s|(/[^/]*){5}$||; symlinkf $root, "/tmp/rhimage" or die "unable to create link /tmp/rhimage"; $o->{method} ||= "cdrom"; + $o->{mkbootdisk} = 0; } unless ($::testing) { diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 9bb37a714..82ac04c82 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -412,14 +412,14 @@ sub write_ldsoconf { sub setAuthentication { my ($o) = @_; - my ($shadow, $md5, $nis, $nis_server) = @{$o->{authentication} || {}}{qw(shadow md5 NIS NIS_server)}; + my ($shadow, $md5, $nis) = @{$o->{authentication} || {}}{qw(shadow md5 NIS)}; my $p = $o->{prefix}; enableMD5Shadow($p, $shadow, $md5); enableShadow() if $shadow; if ($nis) { $o->pkg_install("ypbind"); my $domain = $o->{netc}{NISDOMAIN}; - $domain || $nis_server ne "broadcast" or die _("Can't use broadcast with no NIS domain"); + $domain || $nis ne "broadcast" or die _("Can't use broadcast with no NIS domain"); my $t = $domain ? "domain $domain" . ($nis_server ne "broadcast" && " server") : "ypserver"; substInFile { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 7adb6c7e2..d061a231e 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -389,14 +389,14 @@ Consoles 1,3,4,7 may also contain interesting information"; } my $hasttf; - my $dest = "$o->{prefix}/usr/X11R6/lib/X11/fonts/drakfont"; + my $dest = "/usr/X11R6/lib/X11/fonts/drakfont"; foreach my $d (map { $_->{mntpoint} } grep { isFat($_) } @{$o->{fstab}}) { foreach my $D (map { "$d/$_" } grep { m|^win|i } all("$o->{prefix}$d")) { $D .= "/fonts"; -d "$o->{prefix}$D" or next; log::l("found win font dir $D"); - $hasttf ||= mkdir $dest, 0755; - /(.*)\.ttf/i and symlink "$D/$_", "$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$D"); + $hasttf ||= mkdir "$o->{prefix}$dest", 0755; + /(.*)\.ttf/i and symlink "$D/$_", "$o->{prefix}$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$D"); } } run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir") if $hasttf; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 8092c43c0..def291362 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -105,11 +105,15 @@ sub selectInstallClass1 { sub selectInstallClass($@) { my ($o, @classes) = @_; my %c = my @c = ( + $::corporate ? () : ( _("Recommended") => "beginner", + ), _("Customized") => "specific", _("Expert") => "expert", ); + $o->set_help('selectInstallClassCorpo') if $::corporate; + my $verifInstallClass = sub { $::beginner = $c{$_[0]} eq "beginner"; $::expert = $c{$_[0]} eq "expert" && @@ -618,6 +622,7 @@ sub printerConfig { sub setRootPassword { my ($o, $clicked) = @_; my $sup = $o->{superuser} ||= {}; + my $nis = $o->{authentication}{NIS}; $sup->{password2} ||= $sup->{password} ||= ""; return if $o->{security} < 1 && !$clicked; @@ -634,7 +639,7 @@ _("Password (again)") => { val => \$sup->{password2}, hidden => 1 }, _("Use shadow file") => { val => \$o->{authentication}{shadow}, type => 'bool', text => _("shadow") }, _("Use MD5 passwords") => { val => \$o->{authentication}{md5}, type => 'bool', text => _("MD5") }, ) : (), $::beginner ? () : ( -_("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _("yellow pages") }, +_("Use NIS") => { val => \$nis, type => 'bool', text => _("yellow pages") }, ) ], complete => sub { @@ -645,14 +650,12 @@ _("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _(" } ) or return; - if ($o->{authentication}{NIS}) { - $o->ask_from_entries_ref('', - _("Authentification NIS"), - [ _("NIS Domain"), _("NIS Server") ], - [ \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}), - { val => \$o->{authentication}{NIS_server}, list => ["broadcast"] }, - ]); - } + $o->ask_from_entries_ref('', + _("Authentification NIS"), + [ _("NIS Domain"), _("NIS Server") ], + [ \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}), + { val => \$o->{authentication}{NIS}, list => ["broadcast"] }, + ]) if $nis; install_steps::setRootPassword($o); } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index de85d06d1..b0417098e 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -537,7 +537,7 @@ sub load_thiskind($;&$) { if ($type eq 'scsi') { foreach ("imm", "ppa") { - eval { load($_, $type); push @devs, "imm" }; + eval { load($_, $type); push @devs, [ $_, $_ ] }; last if !$@; } #- hey, we're allowed to pci probe :) let's do a lot of probing! |