Fix extract_modules to just echo a warning that it is missing

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

diff --git a/ChangeLog b/ChangeLog
index e544cc2ffc167641d891cb3a63224da5328ad779..d2c99e00e7f03f06a743be1ceacfd03483382097 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.335 2005/09/30 20:16:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.336 2005/10/05 19:05:50 rocket Exp $
+
+  05 Oct 2005; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh:
+  Fix extract_modules to just echo a warning that it is missing
 
   30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   files/catalyst.conf:

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index acbc937357a7d624658f7f84b7557f88a789b8bf..cdc4c39ae1993a55bfb8de46317099b9ca5deca8 100755 (executable)
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -129,9 +129,13 @@ extract_modules() {
        #$2 = kname     
        kmodules="${clst_chroot_path}/usr/portage/packages/gk_binaries/${2}-modules-${clst_version_stamp}.tar.bz2"
                
-       [ ! -e "${kmodules}" ] && die "Can't find kernel modules tarball at ${kmodules}"
-       mkdir -p ${1}/
-       tar xjf ${kmodules} -C ${1} lib
+       if [ ! -e "${kmodules}" ]
+       then
+           mkdir -p ${1}/
+           tar xjf ${kmodules} -C ${1} lib
+       else
+           echo "Can't find kernel modules tarball at ${kmodules}.  Skipping...."
+       fi
 }
 extract_kernel() {
        #$1 = Destination