summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/Xconfigurator.pm12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index afbd93da4..ccf608e72 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -461,7 +461,13 @@ sub testFinalConfig($;$$) {
$ENV{DISPLAY} = ":9";
- gtkset_background(200 * 257, 210 * 257, 210 * 257);
+ my $background = "/usr/share/pixmaps/mdk/mandrake-logo.xpm";
+ my $qiv = "/usr/bin/qiv";
+ if ("$prefix/$background" && -x "$prefix/$setroot") {
+ system($::testing ? "$prefix" : "chroot $prefix/ ") . "$qiv --display :9 -y $background");
+ } else {
+ gtkset_background(200 * 257, 210 * 257, 210 * 257);
+ }
my ($h, $w) = Gtk::Gdk::Window->new_foreign(Gtk::Gdk->ROOT_WINDOW)->get_size;
$my_gtk::force_position = [ $w / 3, $h / 2.4 ];
$my_gtk::force_focus = 1;
@@ -473,10 +479,6 @@ sub testFinalConfig($;$$) {
1;
});
- my $background = "$prefix/usr/share/pixmaps/mdk/mandrake-logo.xpm";
- my $qiv = "$prefix/usr/bin/qiv";
- -r $background && -x $setroot and
- system(($::testing ? "$prefix" : "chroot $prefix/ ") . "$qiv --display :9 -y $background");
exit (interactive_gtk->new->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222);
};
my $rc = close F;