Commenting out the livecd-kernel code, since the Installer should be doing everything...

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

diff --git a/ChangeLog b/ChangeLog
index 34d17808a622d80a326e47231b0fb6f9d39a65fb..44b6d8652cfa6e849b03fa54d978712aa9ad53ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Commenting out the livecd-kernel code, since the Installer should be doing
+  everything necessary itself.
+
   14 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:
   Fix up the pci.ids/usb.ids code to work with newer pciutils and future-proof

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 6eea526c189a194c6b6e7b64cec86dfc2ef566e4..616b62c885d22e1dc207b2e8118fff26aca33751 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -267,11 +267,11 @@ case ${clst_livecd_type} in
                ;;
        gentoo-release-livecd )
                # First we setup the livecd-kernel package
-               if [ -e /opt/installer/misc/mkvardb ]
-               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)
-               fi
+#              if [ -e /opt/installer/misc/mkvardb ]
+#              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)
+#              fi
 
                # Setup Gnome theme
                if [ "${clst_livecd_xsession}" == "gnome" ]