summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-07 05:37:59 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-07 05:37:59 +0000
commitbaea61ca969fae4a33a0fbd768538877295db4f5 (patch)
tree4a9fd4ec0f1c75084fdbfbea25c4521a3f8f3cf8
parent5eac4b8dfb8518647e1b18b8f16716010defd07a (diff)
downloaddrakx-baea61ca969fae4a33a0fbd768538877295db4f5.tar
drakx-baea61ca969fae4a33a0fbd768538877295db4f5.tar.gz
drakx-baea61ca969fae4a33a0fbd768538877295db4f5.tar.bz2
drakx-baea61ca969fae4a33a0fbd768538877295db4f5.tar.xz
drakx-baea61ca969fae4a33a0fbd768538877295db4f5.zip
fix dialogs popup with drakx-in-chroot
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 22a79e9fb..e68158c51 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1420,7 +1420,7 @@ sub monitor_full_edid() {
# FIXME: is buggy regarding multiple sessions
sub running_window_manager() {
- my @window_managers = qw(ksmserver kwin gnome-session icewm wmaker afterstep fvwm fvwm2 fvwm95 mwm twm enlightenment xfce4-session blackbox sawfish olvwm fluxbox compiz drakx-matchbox-window-manager lxsession);
+ my @window_managers = qw(drakx-matchbox-window-manager ksmserver kwin gnome-session icewm wmaker afterstep fvwm fvwm2 fvwm95 mwm twm enlightenment xfce4-session blackbox sawfish olvwm fluxbox compiz lxsession);
foreach (@window_managers) {
my @pids = fuzzy_pidofs(qr/\b$_\b/) or next;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index dcd291663..8397cfd9e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix dialogs popup with drakx-in-chroot
+
Version 15.26 - 5 March 2013
- include display_installer_help
apos;; cp_af($kernel_rpm, "RPMS/$basename"); if (!$main) { $main = rpm2version($kernel_rpm); output('RPMS/.main', "$main\n"); } if (!$main_BOOT && $kernel_rpm =~ /BOOT/) { $main_BOOT = rpm2version($kernel_rpm); output('RPMS/.main-BOOT', "$main_BOOT\n"); } } sub extract_kernel { my ($kernel_rpm) = @_; my $kern_ver = rpm2version($kernel_rpm); my $dir = "all.kernels/$kern_ver"; warn "Extracting kernel $kern_ver\n"; eval { rm_rf($dir) }; mkdir_p("$dir/modules"); sys("rpm2cpio $kernel_rpm | (cd $dir ; cpio -id)"); rename "$dir/boot/vmlinuz-$kern_ver", "$dir/vmlinuz" or die "can't find vmlinuz\n"; sys("find $dir -name '*.gz' | xargs gunzip"); my $ext = module_extension($kern_ver); open(my $F, "find $dir -name '*.$ext' |"); my $file; while ($file = <$F>) { chomp($file); rename $file, "$dir/modules/" . basename($file) or warn "conflict for $file\n"; } if (kernel_is_26($kern_ver)) { warn "no stripping on 2.6 since it breaks modules\n"; } else { print STDERR "stripping $kern_ver: "; sys("./strip_modules $dir/modules/*.$ext"); print STDERR "done\n"; } sys('perl', 'modules.pl', 'remove_unneeded_modules', $kern_ver) if $kern_ver !~ /BOOT/; sys('perl', 'modules.pl', 'make_modules_per_image', $kern_ver); sys('perl', 'modules.pl', 'make_modules_description', $kern_ver) if $kern_ver eq $main; if (!$MOVE) { print STDERR "packdrake $kern_ver: "; sys("cd $dir/modules ; ls *.$ext | packdrake -b9s ../modules.cz 400000"); print STDERR "done\n"; } eval { rm_rf("$dir$_") } foreach qw(/boot /lib /usr /modules); }