summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-09-13 09:22:05 +0000
committerFrancois Pons <fpons@mandriva.com>2000-09-13 09:22:05 +0000
commiteb6e22590a6665808789eb730165eb3d1c1f9478 (patch)
tree0fd48ceee9b48175cbfe0c4b0b7cee36e7684b1f
parent3c3f7b7a5ef5feef684d6ce66b060aa88df6cddf (diff)
downloaddrakx-backup-do-not-use-eb6e22590a6665808789eb730165eb3d1c1f9478.tar
drakx-backup-do-not-use-eb6e22590a6665808789eb730165eb3d1c1f9478.tar.gz
drakx-backup-do-not-use-eb6e22590a6665808789eb730165eb3d1c1f9478.tar.bz2
drakx-backup-do-not-use-eb6e22590a6665808789eb730165eb3d1c1f9478.tar.xz
drakx-backup-do-not-use-eb6e22590a6665808789eb730165eb3d1c1f9478.zip
*** empty log message ***
-rw-r--r--perl-install/Makefile1
-rw-r--r--perl-install/Xconfigurator.pm4
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 000919348..16e38e700 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -122,7 +122,6 @@ endif
cd share ; cp *.xpm $(DEST)/usr/share
cd share ; cp -a themes $(DEST)/usr/share/gtk
cd share ; cp compssUsers compssList $(ROOTDEST)/Mandrake/base
- cd share ; cp isdndb.net $(DEST)/usr/lib/libDrakX/isdn_db.txt
if [ -f ../modules/modules.cz* ]; then \
cp -f ../modules/modules.cz* $(DEST)/lib/; \
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index eb3186fcb..afbd93da4 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -473,6 +473,10 @@ 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;