diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-12 09:41:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-12 09:41:04 +0000 |
| commit | a6f5badbd4ab6f34b5340a45c7a6557395eddc89 (patch) | |
| tree | edf13bbc9ec270f890a31109da9a5f2bf949bdfe | |
| parent | 55597dec8c0060b2dab62c51783b18319bb1eb10 (diff) | |
| download | drakx-backup-do-not-use-a6f5badbd4ab6f34b5340a45c7a6557395eddc89.tar drakx-backup-do-not-use-a6f5badbd4ab6f34b5340a45c7a6557395eddc89.tar.gz drakx-backup-do-not-use-a6f5badbd4ab6f34b5340a45c7a6557395eddc89.tar.bz2 drakx-backup-do-not-use-a6f5badbd4ab6f34b5340a45c7a6557395eddc89.tar.xz drakx-backup-do-not-use-a6f5badbd4ab6f34b5340a45c7a6557395eddc89.zip | |
no_comment
| -rw-r--r-- | perl-install/Xconfig.pm | 9 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 6 | ||||
| -rw-r--r-- | perl-install/partition_table.pm | 4 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm index fb1b03cc4..6bad6d93e 100644 --- a/perl-install/Xconfig.pm +++ b/perl-install/Xconfig.pm @@ -93,10 +93,11 @@ sub getinfoFromXF86Config { } } #- get the default resolution according the the current file. - my @depth = keys %{$o->{card}{depth}}; - $o->{resolution_wanted} ||= - ($o->{card}{depth}{$o->{default_depth} || $depth[0]}[0][0]) . "x" . - ($o->{card}{depth}{$o->{default_depth} || $depth[0]}[0][1]); + if (my @depth = keys %{$o->{card}{depth}}) { + $o->{resolution_wanted} ||= + ($o->{card}{depth}{$o->{default_depth} || $depth[0]}[0][0]) . "x" . + ($o->{card}{depth}{$o->{default_depth} || $depth[0]}[0][1]); + } $o; } diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index a64e924c5..ff9c39491 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -1126,7 +1126,7 @@ sub main { if ($::isStandalone && $0 =~ /Xdrakres/) { my $found; foreach (@window_managers) { - if (`pidof $_` > 0) { + if (`pidof "$_"` > 0) { if ($in->ask_okcancel('', _("Please relog into %s to activate the changes", ucfirst $_), 1)) { system("kwmcom logout") if /kwm/; system("dcop kdesktop default logout") if /kwin/; @@ -1138,8 +1138,8 @@ sub main { c::setsid(); exec qw(perl -e), q{ my $wm = shift; - for (my $nb = 30; $nb && `pidof $wm` > 0; $nb--) { sleep 1 } - system("killall X") unless `pidof $wm` > 0; + for (my $nb = 30; $nb && `pidof "$wm"` > 0; $nb--) { sleep 1 } + system("killall X") unless `pidof "$wm"` > 0; }, $_; } $found = 1; last; diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index aae124ba5..249416ba3 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -22,8 +22,8 @@ use partition_table_mac; use log; -@important_types = ('Linux native', 'Linux swap', 'Win98 FAT32'); -@important_types2 = (arch() =~ /i.86/ ? 'ReiserFS' : (), 'Linux RAID'); +@important_types = ('Linux native', arch() =~ /i.86/ ? 'ReiserFS' : (), 'Linux swap', 'Win98 FAT32'); +@important_types2 = ('Linux RAID'); @fields2save = qw(primary extended totalsectors isDirty needKernelReread); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index e03f25cce..90ea80424 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -1022,6 +1022,7 @@ sub install($$$;$$) { $total += packageSize($pkg); } + log::l("pkgs::install $prefix"); eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo"; log::l("reading /usr/lib/rpm/rpmrc"); |