From 1d7f9ca1ec1795768a208953ef2151b72bfe8691 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sat, 13 May 2006 14:01:16 +0000 Subject: [PATCH] Make copies and deletes recursive for firmware sicne some packages put their firmware in a subdirectory. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1134 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- targets/support/livecdfs-update.sh | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88d300fe..8f49f551 100644 --- 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 + 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 targets/support/livecdfs-update.sh: diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 6e26aa23..55278112 100755 --- 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 -- 2.26.2