Changed kmerge.sh from --devfs to --no-udev as --devfs doesn't exist.

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

diff --git a/ChangeLog b/ChangeLog
index 7fb7e7dbb39c9b389aa0aaba3102cde10805911f..62c96749e63dde0c8f91dd7a9fee4e3e66ad5579 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.161 2005/01/28 20:53:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.162 2005/01/28 21:00:08 wolf31o2 Exp $
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript-support/kmerge.sh:
+  Changed kmerge.sh from --devfs to --no-udev as --devfs doesn't exist.
 
   28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/hppa-archscript.sh, livecd/runscript/sparc-archscript.sh,

diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index 12b45be09cf600cbe2c7b249bedf9469c3c88041..eaa69f2de8e5c0ac81a64ae031d8547a105a757f 100755 (executable)
--- a/livecd/runscript-support/kmerge.sh
+++ b/livecd/runscript-support/kmerge.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/kmerge.sh,v 1.21 2005/01/28 20:23:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.22 2005/01/28 21:00:08 wolf31o2 Exp $
 
 die() {
        echo "$1"
@@ -53,7 +53,7 @@ build_kernel() {
        then
                GK_ARGS="${GK_ARGS} --udev"
        else
-               GK_ARGS="${GK_ARGS} --devfs"
+               GK_ARGS="${GK_ARGS} --no-udev"
        fi
        
        # build with genkernel using the set options