Removing old mkvardb code which is no longer used, commenting out setting of Gnome...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1256 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 69de38a7a091cb573a760b31471f997a3c05e173..4db62d3d34c66d8c2b4dbc40a8ec986352f8186a 100644 (file)
--- 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 a4e73387d74cca8f45c2515d8a88ed280dde53a4..819e7558db26655ecc316a3f39afb7e84bdfed93 100755 (executable)
--- 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 fd0568f61aebe365bf9dc2b0265f298f734d9c36..2c1a27f0119d4f816c063ec55a0672cd7ec7aced 100755 (executable)
--- 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 3f65362468f0163f18476440f6ae7008ad55f033..7e737d1d3ca2031467973cf90bf4d84a9c92d990 100644 (file)
--- 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