diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-10-01 12:23:43 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-10-01 12:23:43 +0000 |
| commit | d717f05e1896a22513628c406e8c5dba1e646ca9 (patch) | |
| tree | ca3483fbf782350caa97ebbb70fba23b109c2ac7 | |
| parent | 3b9d251ddc19950ed39e0b3d924623c3c0ae4921 (diff) | |
| download | drakx-d717f05e1896a22513628c406e8c5dba1e646ca9.tar drakx-d717f05e1896a22513628c406e8c5dba1e646ca9.tar.gz drakx-d717f05e1896a22513628c406e8c5dba1e646ca9.tar.bz2 drakx-d717f05e1896a22513628c406e8c5dba1e646ca9.tar.xz drakx-d717f05e1896a22513628c406e8c5dba1e646ca9.zip | |
fixed oem images management not working at all!
| -rw-r--r-- | perl-install/install_steps.pm | 38 |
1 files changed, 22 insertions, 16 deletions
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", + ); + } } } |