Fix bashrc so it doesn't give an error and add System.map to livecd-kernel.

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

diff --git a/ChangeLog b/ChangeLog
index 9c03d9bb7c5957091ba9357e4dce1130de3bd142..6ec663c32a444356fb47d32bb114b9cded99ad65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.660 2006/09/08 20:00:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.661 2006/09/13 18:32:35 wolf31o2 Exp $
+
+  13 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/livecd-bashrc, targets/support/livecdfs-update.sh:
+  Fix bashrc so it doesn't give an error and add System.map to livecd-kernel.
 
   08 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/catalyst_support.py:

diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index 85baa140f97d2a286a52663cf0c99d7377ca9a57..983e657d132f0c9c9ec712f073464d93db4c72ed 100644 (file)
--- a/livecd/files/livecd-bashrc
+++ b/livecd/files/livecd-bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ ! $(grep nox /proc/cmdline) ]
+if [ ! "$(grep nox /proc/cmdline)" ]
 then
        if [ -x /usr/bin/X ]
        then

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 18bf6d19b353bda06880572ca57a9623e3a80763..0c18f8d9cdc892723e2f0b1dd17a228ec33c0663 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.62 2006/08/23 11:20:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.63 2006/09/13 18:32:36 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -245,7 +245,7 @@ case ${clst_livecd_type} in
                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/kernel* /boot/initr* $(for i in $(find "/lib/modules/" -type f); do grep --quiet "${i}" /var/db/pkg/*/*/CONTENTS || echo ${i}; done)
+                       /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