modules.conf fix

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

diff --git a/ChangeLog b/ChangeLog
index 3a9658ec8bf5dea83a41a73bd8189a6a6956ab31..a33acf51c4390753f04179f5f179473fb8ad47fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.32 2004/04/01 15:49:38 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.33 2004/04/01 20:00:18 zhen Exp $
+
+  01 Apr 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript/default-runscript.sh:
+  added in fix for the module.conf stuff courtesy of Benjamin Judas
+  <beejay@gentoo.org>
 
   01 Apr 2004; John Davis <zhen@gentoo.org> catalyst, files/catalyst.conf,
   files/x86-help.msg:

diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh
index 8c4b692639d708d97355ad1a372ff7a3653435ec..019009f0eb721ec06f05f68c343eb5c4af7eee12 100644 (file)
--- a/livecd/runscript/default-runscript.sh
+++ b/livecd/runscript/default-runscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.5 2004/03/30 19:45:14 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.6 2004/04/01 20:00:18 zhen Exp $
 
 #return codes to be used by archscript
 
@@ -157,6 +157,12 @@ EOF
                                                update-modules
                                        done
                                fi
+
+                               #fix to get modprobe.conf
+                               ln -s /lib/modules/\`sed -n '1s/.* //;1s/"//g; 1p' /usr/src/linux/include/linux/version.h\` /lib/modules/`uname -r`
+                               /sbin/modules.update
+                               rm `uname -r`
+
                                cd /usr/src
                                rm -rf linux*
                                #now the unmerge... (wipe db entry)
@@ -181,7 +187,7 @@ EOF
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.5 2004/03/30 19:45:14 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.6 2004/04/01 20:00:18 zhen Exp $
 
 depend() {
        after *