diff options
| -rw-r--r-- | perl-install/install2.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 10 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/run_program.pm | 4 |
5 files changed, 14 insertions, 11 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 15566d0c7..c44728d1f 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -721,6 +721,9 @@ sub main { last if $o->{step} eq 'exitInstall'; } + #- mainly for auto_install's + run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall}; + install_any::clean_postinstall_rpms(); install_any::ejectCdrom(); @@ -740,7 +743,7 @@ sub main { -e "$o->{prefix}/usr/bin/urpmi" or eval { commands::rm("-rf", "$o->{prefix}/var/lib/urpmi") }; #- have the really bleeding edge ddebug.log for this f*cking msec :-/ - eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") }; + eval { commands::cp('-f', "/tmp/ddebug.log", "/tmp/exec.log", "$o->{prefix}/root") }; #- ala pixel? :-) [fpons] sync(); sync(); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 8c4d5d2d2..c209b56e8 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -51,7 +51,7 @@ sub leavingStep { log::l("step `$step' finished"); if (-d "$o->{prefix}/root") { - eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") }; + eval { commands::cp('-f', "/tmp/ddebug.log", "/tmp/exec.log", "$o->{prefix}/root") }; install_any::g_auto_install(); } @@ -305,9 +305,12 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK! #- small transaction will be built based on this selection and depslist. my @toInstall = pkgs::packagesToInstall($packages); + my $time = time; $ENV{DURING_INSTALL} = 1; pkgs::install($o->{prefix}, $o->{isUpgrade}, \@toInstall, $packages->[1], $packages->[2]); + run_program::rooted($o->{prefix}, 'ldconfig'); delete $ENV{DURING_INSTALL}; + log::l("Install took: ", formatTime(time - $time)); } sub afterInstallPackages($) { @@ -354,9 +357,6 @@ Consoles 1,3,4,7 may also contain interesting information"; #- call update-menus at the end of package installation run_program::rooted($o->{prefix}, "update-menus"); - #- mainly for auto_install's - run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall}; - #- create /etc/sysconfig/desktop file according to user choice and presence of /usr/bin/kdm or /usr/bin/gdm. my $f = "$o->{prefix}/etc/sysconfig/desktop"; if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") { @@ -924,7 +924,7 @@ sub miscellaneous { $ENV{SECURE_LEVEL} = $o->{security}; add2hash_ $o, { useSupermount => $o->{security} < 4 && arch() !~ /sparc/ && $o->{installClass} !~ /corporate|server/ }; - cat_("/proc/cmdline") =~ /mem=(\S+)/; + cat_("/proc/cmdline") =~ /.mem=(\S+)/; #- if /^mem/, it means that's the value grub gave add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1) : () }); local $_ = $o->{bootloader}{perImageAppend}; diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 10878f247..7bf295fb8 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -509,7 +509,7 @@ sub choosePackagesTree { $tree->signal_connect(button_press_event => sub { &$toggle if $_[1]{type} =~ /^2/ }); $tree->signal_connect(key_press_event => sub { my ($w, $e) = @_; - my $c = chr $e->{keyval}; + my $c = chr($e->{keyval} & 0xff); &$toggle if $e->{keyval} >= 0x100 ? $c eq "\r" || $c eq "\x8d" : $c eq ' '; 1; }); @@ -818,7 +818,7 @@ sub init_sizes() { ($::rootheight, $::rootwidth) = (480, 640); ($::rootheight, $::rootwidth) = my_gtk::gtkroot()->get_size; #- ($::rootheight, $::rootwidth) = (min(768, $::rootheight), min(1024, $::rootwidth)); - ($::stepswidth, $::stepsheight) = (140, $::rootheight); + ($::stepswidth, $::stepsheight) = (145, $::rootheight); ($::logowidth, $::logoheight) = ($::rootwidth - $::stepswidth, 40); ($::helpwidth, $::helpheight) = ($::rootwidth - $::stepswidth, 100); ($::windowwidth, $::windowheight) = ($::rootwidth - $::stepswidth, $::rootheight - $::helpheight - $::logoheight); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 36647a872..60b856b83 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -642,7 +642,7 @@ sub setSelectedFromCompssList { my @packages = allPackages($packages); my @places = do { #- special case for /^k/ aka kde stuff - my @values = map { $_->{values}[$ind] + (packageFlagUnskip($_) && packageName($_) !~ /^k/ ? 10 : 0) } @packages; + my @values = map { $_->{values}[$ind] + (packageFlagUnskip($_) && packageName($_) !~ /^k/ ? 10 : 1) } @packages; sort { $values[$b] <=> $values[$a] } 0 .. $#packages; }; foreach (@places) { diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm index 38fdbf8a9..73d8a9995 100644 --- a/perl-install/run_program.pm +++ b/perl-install/run_program.pm @@ -33,12 +33,12 @@ sub rooted { $stderrm =~ s/2//; open STDERR, "$stderrm $root$stderr" or die "run_program can't output in $root$stderr (mode `$stderrm')"; } else { - open STDERR, ">> /dev/tty7" or open STDERR, ">> /tmp/exec.log" or die "run_program can't log, give me access to /tmp/exec.log"; + open STDERR, ">> /tmp/exec.log" or open STDOUT, ">> /dev/tty7" or die "run_program can't log, give me access to /tmp/exec.log"; } if ($stdout) { open STDOUT, "$stdoutm $root$stdout" or die "run_program can't output in $root$stdout (mode `$stdoutm')"; } else { - open STDOUT, ">> /dev/tty7" or open STDOUT, ">> /tmp/exec.log" or die "run_program can't log, give me access to /tmp/exec.log"; + open STDOUT, ">> /tmp/exec.log" or open STDOUT, ">> /dev/tty7" or die "run_program can't log, give me access to /tmp/exec.log"; } $root and chroot $root; |