firmware tarball fix for packages that need firmware such as ipw2100

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

diff --git a/ChangeLog b/ChangeLog
index c1870d056acad39e1e3c5c0dff81684b6fc02d73..357764c2b1ed85f21e45d1ef9151a156bc4d0f92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.97 2004/10/16 13:38:09 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.98 2004/10/18 02:55:16 zhen Exp $
+
+  17 Oct 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript-support/livecdfs-update.sh:
+  firmware tarball fix for packages that need firmware such as ipw2100
 
   16 Oct 2004; <zhen@gentoo.org> livecd/files/x86-help.msg,
   livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh,

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 78b3e667873f877d1edb7760260b169a163ab853..9191c237316e650b482fccc75c358a16a2d9d8ec 100755 (executable)
--- a/livecd/runscript-support/livecdfs-update.sh
+++ b/livecd/runscript-support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.14 2004/10/16 13:38:09 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.15 2004/10/18 02:55:16 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -64,7 +64,7 @@ sed -i -e '/dev-state/ s/^/#/' /etc/devfsd.conf
 mv /etc/fstab /etc/fstab.old
 echo "###############################################" >> /etc/fstab
 echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD" >> /etc/fstab     
-echo "## PLEASE EDIT THE FSTAB IN /mnt/gentoo/etc" >> /etc/fstab     
+echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab" >> /etc/fstab     
 echo "###############################################" >> /etc/fstab
 cat /etc/fstab.old >> /etc/fstab
 rm /etc/fstab.old
@@ -131,3 +131,6 @@ then
                exit 1
        fi
 fi
+
+# tar up the firmware so that it does not get clobbered by the livecd mounts
+tar cjpf /usr/lib/hotplug/firmware/firmware.tar.bz2 /usr/lib/hotplug/firmware/*