From 3bc20c1ea1a306475ea8eab8e8e1973625ca785f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 15 Dec 1999 12:50:29 +0000 Subject: no_comment --- docs/TODO | 11 +++++++++++ perl-install/Xconfigurator.pm | 3 ++- perl-install/install2.pm | 4 ++-- perl-install/install_any.pm | 7 ++++++- perl-install/install_steps.pm | 9 +++++++++ perl-install/install_steps_gtk.pm | 4 ++-- perl-install/install_steps_interactive.pm | 4 ++-- perl-install/interactive_gtk.pm | 2 ++ perl-install/pkgs.pm | 13 +++++++++---- perl-install/share/compssList | 26 +++++++++++++------------- perl-install/timezone.pm | 1 + 11 files changed, 59 insertions(+), 25 deletions(-) diff --git a/docs/TODO b/docs/TODO index b6a413b95..d1bda97cc 100644 --- a/docs/TODO +++ b/docs/TODO @@ -1,3 +1,7 @@ +in draksec, (and maybe others) have --expert as default if /etc/sysconfig/system has TYPE=expert + +bug in users: mandrake user is added twice in strange installs + bug in upgrade: install from hda1:/usr/local/blah with hda1:/ in XFdrake, testing should not overwrite /etc/X11/XF86Config @@ -169,3 +173,10 @@ suggested partition tables must be better foreach installClass (done,dindinx)app for choosing drakxtools (drakxconf) (done,pix)verify being root (done,pix)log::l -> initlog + +(done,pix)install apmd for laptops (maybe not start apmd though) +(done,pix)icewm apm (sh icewm_apm) +(done,pix)kde apm (put Kapm.kdelnk in ~/Desktop/Autostart) + +(done,pix)bug in adduserdrake: missing pwconv in md5 +(done,pix)correct the default value of draksec (cp draksec) diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 0327b4728..da7d574b7 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -772,7 +772,8 @@ sub main { _("What do you want to do?"), [ grep { !ref } @c ]); eval { &{$c{$f}} }; - !$@ || $@ =~ /^ask_from_list cancel/ or die; + !$@ || $@ =~ /ask_from_list cancel/ or die; + $in->kill; } if ($ok) { diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 006fc3901..e585e7eb8 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -600,13 +600,13 @@ sub main { last if $o->{step} eq 'exitInstall'; } - substInFile { s|/sbin/mingetty tty1.*|/bin/bash --login| } "$o->{prefix}/etc/inittab" if $o->{security} < 1; +#- substInFile { s|/sbin/mingetty tty1.*|/bin/bash --login| } "$o->{prefix}/etc/inittab" if $o->{security} < 1; output("$o->{prefix}/tmp/secure.DrakX", "DRAKX_PASSWORD=$o->{lilo}{password}\n", 'DRAKX_USERS="', join(" ", map { $_->{name} } @{$o->{users} || []}), qq("\n)); run_program::rooted($o->{prefix}, "/etc/security/msec/init.sh", $o->{security}); - unlink "$o->{prefix}/tmp/secure.DrakX"; +#- unlink "$o->{prefix}/tmp/secure.DrakX"; run_program::rooted($o->{prefix}, "kudzu", "-q"); # -q <=> fermetagueuleconnard diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index da0a773a2..369227b9a 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -122,13 +122,18 @@ sub setPackages($) { push @{$o->{default_packages}}, "kernel-secure" if $o->{security} > 3; push @{$o->{default_packages}}, "kernel-smp" if $o->{security} <= 3 && detect_devices::hasSMP(); #- no need for kernel-smp if we have kernel-secure which is smp push @{$o->{default_packages}}, "kernel-pcmcia-cs" if $o->{pcmcia}; + push @{$o->{default_packages}}, "apmd" if $o->{pcmcia}; push @{$o->{default_packages}}, "raidtools" if !is_empty_hash_ref($o->{raid}); pkgs::getDeps($o->{packages}); my $c; ($o->{compss}, $c) = pkgs::readCompss($o->{packages}); $o->{compssListLevels} = pkgs::readCompssList($o->{packages}, $c); - $o->{compssUsers} = pkgs::readCompssUsers($o->{packages}, $o->{compss}); + ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{packages}, $o->{compss}); + + my @l = (); + push @l, "kapm" if $o->{pcmcia}; + $_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { $o->{packages}{$_} } @l; grep { !$o->{packages}{$_} && log::l("missing base package $_") } @{$o->{base}} and die "missing some base packages"; } else { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index c650032dc..b1e439058 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -253,6 +253,9 @@ sub afterInstallPackages($) { $o->pcmciaConfig(); + #- remove the nasty acon... + run_program::rooted($o->{prefix}, "chkconfig", "--del", "acon") unless $ENV{LANGUAGE} =~ /ar/; + #- miscellaneous addToBeDone { setVarsInSh("$o->{prefix}/etc/sysconfig/system", { @@ -263,6 +266,12 @@ sub afterInstallPackages($) { install_any::fsck_option(); } 'doInstallStep'; + if ($o->{pcmcia}) { + substInFile { s/.*(TaskBarShowAPMStatus).*/$1=1/ } "$o->{prefix}/usr/lib/X11/icewm/preferences"; + eval { commands::cp("$o->{prefix}/usr/share/applnk/System/kapm.kdelnk", + "$o->{prefix}/etc/skel/Desktop/Autostart/kapm.kdelnk") }; + } + my $p = $o->{packages}{urpmi}; install_any::install_urpmi($o->{prefix}, $o->{method}) if $p && $p->{selected}; } diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index db1461b47..84579e4b9 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -294,7 +294,7 @@ _("TODO"))) { #------------------------------------------------------------------------------ sub choosePackages { - my ($o, $packages, $compss, $compssUsers, $first_time) = @_; + my ($o, $packages, $compss, $compssUsers, $compssUsersSorted, $first_time) = @_; if ($::beginner) { require pkgs; @@ -335,7 +335,7 @@ sub chooseSizeToInstall { $o->{installClass}, $o->{isUpgrade}); } sub choosePackagesTree { - my ($o, $packages, $compss, $compssUsers) = @_; + my ($o, $packages, $compss) = @_; my $availableSpace = int(install_any::getAvailableSpace($o) / sqr(1024)); my $w = my_gtk->new(''); add2hash_($o->{packages_}, { show_level => 0 }); #- keep show more or less 80 }); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 6abd2a9ee..8b859aaa8 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -227,12 +227,12 @@ sub selectPackagesToUpgrade { } #------------------------------------------------------------------------------ sub choosePackages { - my ($o, $packages, $compss, $compssUsers) = @_; + my ($o, $packages, $compss, $compssUsers, $compssUsersSorted) = @_; require pkgs; $o->ask_many_from_list_ref('', _("Package Group Selection"), - [ keys %$compssUsers ], + [ @$compssUsersSorted ], [ map { \$o->{compssUsersChoice}{$_} } keys %$compssUsers ] ); while (my ($k, $v) = each %{$o->{compssUsersChoice}}) { diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index c857ea85b..049c25753 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -47,6 +47,7 @@ sub ask_from_listW { ), ); $defW->grab_focus if $defW; + $w->{rwindow}->set_position('center'); $w->main; } else { $w->_ask_from_list($title, $messages, $l, $def); @@ -212,6 +213,7 @@ sub wait_messageW($$$) { gtkpack(new Gtk::VBox(0,0), @$messages, $w->{wait_messageW} = new Gtk::Label($W))); + $w->{rwindow}->set_position('center'); $w->{wait_messageW}->signal_connect(expose_event => sub { $w->{displayed} = 1 }); $w->sync until $w->{displayed}; $w; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 3409956c3..1418ac247 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -30,6 +30,7 @@ my %by_lang = ( 'zh_TW.Big5' => [ 'rxvt-CLE' ], ); +my @prefered = qw(perl-GTK); my $A = 20471; my $B = 16258; @@ -49,6 +50,7 @@ sub allpackages { sub select($$;$) { my ($packages, $p, $base) = @_; + my %prefered; @prefered{@prefered} = (); my ($n, $v); unless ($p->{installed}) { #- if the same or better version is installed, do not select. $p->{base} ||= $base; @@ -59,8 +61,10 @@ sub select($$;$) { my $i = $packages->{$n}; if (!$i && $n =~ /\|/) { foreach (split '\|', $n) { - $i = Package($packages, $_); - last if $i && $i->{selected}; + my $p = Package($packages, $_); + $i ||= $p; + $p && $p->{selected} and $i = $p, last; + $p && exists $prefered{$_} and $i = $p; } } $i->{base} ||= $base; @@ -251,7 +255,7 @@ sub readCompssList($$$) { sub readCompssUsers { my ($packages, $compss) = @_; - my (%compssUsers, $l); + my (%compssUsers, @sorted, $l); my $f = install_any::getFile("compssUsers") or die "can't find compssUsers"; foreach (<$f>) { @@ -259,6 +263,7 @@ sub readCompssUsers { s/#.*//; if (/^(\S.*)/) { + push @sorted, $1; $compssUsers{$1} = $l = []; } elsif (/\s+\+(.*)/) { push @$l, $packages->{$1} || do { log::l("unknown package $1 (in compssUsers)"); next }; @@ -269,7 +274,7 @@ sub readCompssUsers { push @$l, @{ category2packages($p) }; } } - \%compssUsers; + \%compssUsers, \@sorted; } #- sub isLangSensitive($$) { diff --git a/perl-install/share/compssList b/perl-install/share/compssList index f254d09be..a973ff6e2 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -6,7 +6,7 @@ acon 24 24 24 adjtimex 22 35 87 AfterStep 55 35 53 AfterStep-APPS 58 30 55 -aktion 89 5 15 +aktion 76 5 15 am-utils 0 0 19 anacron 85 70 85 anonftp 0 86 13 @@ -23,7 +23,7 @@ aumix 28 0 2 authconfig 90 99 90 autoconf 15 0 94 autofs 48 0 50 -autoirpm-icons 85 0 80 +autoirpm-icons 0 0 0 automake 15 0 94 awesfx 20 0 13 bash1 15 0 13 @@ -58,7 +58,7 @@ chos-vchos 0 0 0 cleanfeed 24 99 21 colorgcc 10 0 84 comanche 22 78 0 -compat-glibc 0 0 96 +compat-glibc 0 0 40 comsat 0 30 2 control-center 69 0 10 control-center-devel 10 0 10 @@ -83,8 +83,8 @@ dip 40 0 13 dosemu 45 0 49 dosemu-freedos 45 0 49 dosfstools 40 0 22 -drakxconf 89 0 89 -drakxtools 85 0 89 +DrakConf 84 0 84 +drakxtools 87 0 87 dump 10 0 87 e2fsprogs-devel 10 0 25 ed 45 0 5 @@ -157,7 +157,7 @@ gftp 67 0 62 ghostscript 40 99 75 ghostscript-fonts 22 99 75 giftrans 42 0 71 -gimp 89 0 50 +gimp 78 0 67 gimp-data-extras 55 0 58 gimp-devel 10 0 40 gimp-libgimp 10 0 50 @@ -268,7 +268,7 @@ jed-xjed 40 0 22 jikes 1 1 65 joe 40 0 15 kaffe 10 0 60 -kapm 72 0 60 +kapm 26 0 20 kBeroFTPD 59 99 53 kcmclock 0 0 0 kcmlaptop 72 0 60 @@ -310,7 +310,7 @@ klilo 72 0 60 klyx 50 0 58 kmag 72 0 60 kmemmon 72 0 60 -kmom 82 0 60 +kmom 73 0 60 kmpg 72 0 60 knetload 72 0 60 knewmail 72 0 60 @@ -502,18 +502,18 @@ ncompress 42 79 91 ncpfs 0 0 0 ncurses 0 0 80 ncurses-devel 10 0 80 -netcfg 82 79 82 +netcfg 2 9 2 netkit-base 82 99 82 netscape-common 0 0 0 -netscape-communicator 89 0 73 -netscape-francais 20 50 22 +netscape-communicator 87 0 73 +netscape-francais 17 0 3 netscape-navigator 50 0 54 newt 10 0 75 newt-devel 10 0 75 nfs-utils 0 80 13 nfs-utils-clients 45 75 53 nmh 0 0 0 -npxanim 82 0 61 +npxanim 75 0 61 nscd 0 40 0 open 20 0 80 ORBit 0 0 55 @@ -597,7 +597,7 @@ sendmail 21 88 36 sendmail-cf 21 88 36 sendmail-doc 31 35 36 setserial 42 0 55 -setuptool 90 0 90 +setuptool 0 0 50 sgml-tools 16 0 75 shapecfg 20 0 8 sharutils 43 99 38 diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index 8ea53f333..f0c7cb207 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -37,6 +37,7 @@ sub write($$$) { } my %l2t = ( +'Brezhoneg (Brittany)' => 'Europe/Paris', 'Danish (Denmark)' => 'Europe/Copenhagen', 'English (USA)' => 'America/New_York', 'English (UK)' => 'Europe/London', -- cgit v1.2.1