From d717f05e1896a22513628c406e8c5dba1e646ca9 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 1 Oct 2002 12:23:43 +0000
Subject: fixed oem images management not working at all!

---
 perl-install/install_steps.pm | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index dd3ad5cda..6c5a59b8b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -511,27 +511,33 @@ GridHeight=70
     }
 
     #- update oem lilo image if it exists.
-    if (-s "/boot/oem-message-graphic") {
+    if (-s "$o->{prefix}/boot/oem-message-graphic") {
 	rename "$o->{prefix}/boot/message-graphic", "$o->{prefix}/boot/message-graphic.mdkgiorig";
 	rename "$o->{prefix}/boot/oem-message-graphic", "$o->{prefix}/boot/message-graphic";
     }
 
     #- update background image if it exists for common environment.
-    if (-s -s "/usr/share/mdk/oem-background.png") {
-	#- KDE desktop background.
-	if (-e "$o->{prefix}/usr/share/config/kdesktoprc") {
-	    update_gnomekderc("$o->{prefix}/usr/share/config/kdesktoprc", "Desktop0",
-			      MultiWallpaperMode => "NoMulti",
-			      Wallpaper => "/usr/share/mdk/oem-background.png",
-			      WallpaperMode => "Scaled",
-			     );
-	}
-	#- GNOME desktop background.
-	if (-e "$o->{prefix}/etc/gnome/config/Background") {
-	    update_gnomekderc("$o->{prefix}/etc/gnome/config/Background", "Default",
-			      wallpaper => "/usr/share/mdk/oem-background.png",
-			      wallpaperAlign => "3",
-			     );
+    if (-s "$o->{prefix}/usr/share/mdk/oem-background.png") {
+	if (-e "$o->{prefix}/usr/share/mdk/backgrounds/default.png") {
+	    rename "$o->{prefix}/usr/share/mdk/backgrounds/default.png",
+	           "$o->{prefix}/usr/share/mdk/backgrounds/default.png.mdkgiorig";
+	    rename "$o->{prefix}/usr/share/mdk/oem-background.png", "$o->{prefix}/usr/share/mdk/backgrounds/default.png";
+	} else {
+	    #- KDE desktop background.
+	    if (-e "$o->{prefix}/usr/share/config/kdesktoprc") {
+		update_gnomekderc("$o->{prefix}/usr/share/config/kdesktoprc", "Desktop0",
+				  MultiWallpaperMode => "NoMulti",
+				  Wallpaper => "/usr/share/mdk/oem-background.png",
+				  WallpaperMode => "Scaled",
+				 );
+	    }
+	    #- GNOME desktop background.
+	    if (-e "$o->{prefix}/etc/gnome/config/Background") {
+		update_gnomekderc("$o->{prefix}/etc/gnome/config/Background", "Default",
+				  wallpaper => "/usr/share/mdk/oem-background.png",
+				  wallpaperAlign => "3",
+				 );
+	    }
 	}
     }
 
-- 
cgit v1.2.1