Firmware updated to use new /lib/firmware directory.

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

diff --git a/ChangeLog b/ChangeLog
index 5d07034c2729cfa943c590ca5927fa81ae3587b8..3ce5b5dddd0d0c4ed76b77053f4de92dae18278a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.150 2005/01/16 15:05:50 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.151 2005/01/23 19:21:40 wolf31o2 Exp $
+
+  23 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript-support/livecdfs-update.sh:
+  Firmware updated to use new /lib/firmware directory.
 
   16 Jan 2005; John Davis <zhen@gentoo.org> catalyst:
   fix from pvdabeel@gentoo.org. patch fixes a small bug that caused grp to not

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 3f3fcc80ad10495347967dc43527ece13d54cd15..5cfdd5ed60d8e5be41a9f2be5facb7caaf3da927 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.27 2005/01/11 13:12:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.28 2005/01/23 19:21:40 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -91,7 +91,7 @@ mkdir -p /etc/sysconfig
 
 # fstab tweaks
 echo "tmpfs            /                               tmpfs   defaults        0 0" > /etc/fstab
-echo "tmpfs            /usr/lib/hotplug/firmware       tmpfs   defaults        0 0" >> /etc/fstab
+echo "tmpfs            /lib/firmware   tmpfs   defaults        0 0" >> /etc/fstab
 sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
 
 # tweak the livecd fstab so that users know not to edit it
@@ -182,5 +182,11 @@ then
 fi
 
 # tar up the firmware so that it does not get clobbered by the livecd mounts
-[ -n "$(ls /usr/lib/hotplug/firmware)" ] && cd /usr/lib/hotplug/firmware && tar cvjpf /usr/lib/hotplug/firmware.tar.bz2 . && rm -f /usr/lib/hotplug/firmware/*
-ln -sf /lib/firmware /usr/lib/hotplug/firmware
+if [ -n "$(ls /lib/firmware)"]
+then
+       cd /lib/firmware
+       tar cvjpf /lib/firmware.tar.bz2 .
+       rm -f /lib/firmware/*
+       mkdir -p /usr/lib/hotplug
+       ln -sf /lib/firmware /usr/lib/hotplug/firmware
+fi