Make copies and deletes recursive for firmware sicne some packages put their firmware...

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

diff --git a/ChangeLog b/ChangeLog
index 88d300fe4abc8d8aca38c7e48c2033ccfd732186..8f49f551be0f204d0c6db3a3814a2fa549256f11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.618 2006/05/10 15:55:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.619 2006/05/13 14:01:16 wolf31o2 Exp $
+
+  13 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Make copies and deletes recursive for firmware sicne some packages put their
+  firmware in a subdirectory.
 
   10 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 6e26aa233ec5139954c1707c106db0d53b8dbd0a..55278112f59aa030b8cba1a03c29bb76e33bec9a 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.48 2006/05/10 15:55:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.49 2006/05/13 14:01:16 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -197,10 +197,10 @@ then
        cd /lib/firmware
        if [ -n "$(ls /usr/lib/hotplug/firmware)" ]
        then
-               cp /usr/lib/hotplug/firmware/* /lib/firmware
+               cp -r /usr/lib/hotplug/firmware/* /lib/firmware
        fi
        /bin/tar cjpf /lib/firmware.tar.bz2 .
-       rm -f /lib/firmware/*
+       rm -rf /lib/firmware/*
        mkdir -p /usr/lib/hotplug
        rm -rf /usr/lib/hotplug/firmware
        ln -sf /lib/firmware /usr/lib/hotplug/firmware