From 882c246645ded111e27265ad04967bc66cfa4f7e Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 13 Nov 2007 22:13:42 +0000
Subject: [PATCH] Removing old mkvardb code which is no longer used, commenting
 out setting of Gnome theme for testing now that Clearlooks has been default
 for some time, and changing vdb move from a case statement to a simple if
 statement.  This is 2.0.5_pre5 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1256 d1e1f19c-881f-0410-ab34-b69fee027534
---
 ChangeLog                          |  7 +++++
 catalyst                           |  2 +-
 targets/support/livecdfs-update.sh | 45 +++++++++++++-----------------
 targets/support/unmerge.sh         |  7 +++--
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69de38a7..4db62d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/livecdfs-update.sh, targets/support/unmerge.sh:
+  Removing old mkvardb code which is no longer used, commenting out setting of
+  Gnome theme for testing now that Clearlooks has been default for some time,
+  and changing vdb move from a case statement to a simple if statement. This
+  is 2.0.5_pre5 for testing.
+
   13 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/stage1_target.py:
   Removing cleaning of python encodings for bug #64890.
diff --git a/catalyst b/catalyst
index a4e73387..819e7558 100755
--- a/catalyst
+++ b/catalyst
@@ -9,7 +9,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.5_pre4"
+__version__="2.0.5_pre5"
 
 conf_values={}
 
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index fd0568f6..2c1a27f0 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -261,35 +261,28 @@ case ${clst_livecd_type} in
 		touch /etc/startx
 		;;
 	gentoo-release-livecd )
-		# First we setup the livecd-kernel package
-#		if [ -e /opt/installer/misc/mkvardb ]
+		# Setup Gnome theme
+#		if [ "${clst_livecd_xsession}" == "gnome" ]
 #		then
-#			chmod +x /opt/installer/misc/mkvardb
-#			/opt/installer/misc/mkvardb -p livecd-kernel -c sys-kernel -v ${clst_version_stamp} --provide "virtual/alsa" /boot/System* /boot/kernel* /boot/initr* $(for i in $(find "/lib/modules/" -type f); do grep --quiet "${i}" /var/db/pkg/*/*/CONTENTS || echo ${i}; done)
+#			gconftool-2 --direct \
+#				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+#				--type string --set /desktop/gnome/interface/theme Clearlooks
+#			gconftool-2 --direct \
+#				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+#				--type string --set /apps/metacity/general/theme Clearlooks
+#			gconftool-2 --direct \
+#				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+#				--type string --set /desktop/gnome/interface/gtk_key_theme \
+#				Clearlooks
+#			gconftool-2 --direct \
+#				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+#				--type string --set /desktop/gnome/interface/gtk_theme \
+#				Clearlooks
+#			gconftool-2 --direct \
+#				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+#				--type string --set /desktop/gnome/interface/font_name "Sans 9"
 #		fi
 
-		# Setup Gnome theme
-		if [ "${clst_livecd_xsession}" == "gnome" ]
-		then
-			gconftool-2 --direct \
-				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
-				--type string --set /desktop/gnome/interface/theme Clearlooks
-			gconftool-2 --direct \
-				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
-				--type string --set /apps/metacity/general/theme Clearlooks
-			gconftool-2 --direct \
-				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
-				--type string --set /desktop/gnome/interface/gtk_key_theme \
-				Clearlooks
-			gconftool-2 --direct \
-				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
-				--type string --set /desktop/gnome/interface/gtk_theme \
-				Clearlooks
-			gconftool-2 --direct \
-				--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
-				--type string --set /desktop/gnome/interface/font_name "Sans 9"
-		fi
-
 		# Setup GDM
 		if [ "${clst_livecd_xdm}" == "gdm" ]
 		then
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 3f653624..7e737d1d 100644
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -6,8 +6,9 @@ update_env_settings
 
 run_emerge -C ${clst_packages}
 
-case ${clst_livecd_type} in
-	gentoo-release-livecd ) mv -f /var/db /usr/livecd ;;
-esac
+if [ "${clst_livecd_type}" == "gentoo-release-livecd" ]
+then
+	mv -f /var/db /usr/livecd
+fi
 
 exit 0
-- 
2.26.2