4 files changed, 4 insertions, 13 deletions
diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash
index 3173a7a..f4d5dab 100755
--- a/scripts/make-boot-splash
+++ b/scripts/make-boot-splash
@@ -3,12 +3,12 @@
 # Copyright (C) 2002 by Chmouel Boudjnah <chmouel@mandrakesoft.com>
 # Redistribution of this file is permitted under the terms of the GNU 
 # Public License (GPL)
-# $Id$
+# $Id: make-boot-splash 261558 2009-10-07 17:07:28Z fcrozat $
 
 : ${splash_dir=/usr/share/bootsplash}
 
 [[ -f /etc/sysconfig/bootsplash ]] && source /etc/sysconfig/bootsplash
-[[ -z $THEME ]] && THEME=Mandriva
+[[ -z $THEME ]] && THEME=Mageia-Default
 
 [ $# = 2 ] || { echo "usage: $0 <initrd> <resolution>"; exit 1; }
 
diff --git a/scripts/make-boot-splash-raw b/scripts/make-boot-splash-raw
index 2b3c034..f55f830 100755
--- a/scripts/make-boot-splash-raw
+++ b/scripts/make-boot-splash-raw
@@ -3,7 +3,7 @@
 # Copyright (C) 2002 by Chmouel Boudjnah <chmouel@mandrakesoft.com>
 # Redistribution of this file is permitted under the terms of the GNU 
 # Public License (GPL)
-# $Id$
+# $Id: make-boot-splash-raw 263874 2009-11-30 18:28:33Z pterjan $
 
 : ${splash_dir=/usr/share/bootsplash}
 
diff --git a/scripts/remove-theme b/scripts/remove-theme
index 7bfe9e5..90e1682 100644
--- a/scripts/remove-theme
+++ b/scripts/remove-theme
@@ -13,7 +13,6 @@ function get_current_theme () {
 	[[ $opt != THEME=* ]] && continue
 	theme=${opt##*=}
     done < $sysconfig
-    #[[ -z $theme ]] && theme="Mandriva"
     echo $theme
 }
 
@@ -47,13 +46,6 @@ function update_boot () {
 }
 
 theme_to_remove=$1
-if [ "$theme_to_remove" = Mandrakelinux ]; then
-    # in case we are upgrading mandrakelinux-theme to mandriva-theme
-    # "remove-theme Mandrakelinux" will be called thinking there is no theme anymore
-    grep -qi "THEME=Mandriva" $sysconfig && exit 0
-fi
-
-
 current_theme=$(get_current_theme)
 if [ -z "$theme_to_remove" -o "$theme_to_remove" = "$current_theme" ]; then
     echo Removing $current_theme theme
diff --git a/scripts/switch-themes b/scripts/switch-themes
index b5b709f..9f8b6c3 100755
--- a/scripts/switch-themes
+++ b/scripts/switch-themes
@@ -3,7 +3,7 @@
 # Copyright (C) 2002 by Chmouel Boudjnah <chmouel@mandrakesoft.com>
 # Redistribution of this file is permitted under the terms of the GNU 
 # Public License (GPL)
-# 	$Id$	
+# 	$Id: switch-themes 261681 2009-10-12 10:16:06Z fcrozat $	
 
 plymouthdir=/usr/share/plymouth
 sysconfig=/etc/sysconfig/bootsplash
@@ -23,7 +23,6 @@ function get_current_theme () {
 	[[ $opt != THEME=* ]] && continue
 	theme=${opt##*=}
     done < $sysconfig
-    #[[ -z $theme ]] && theme="Mandriva"
     echo $theme
 }