Force devfs if udev is not selected for all supporting arches.

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

diff --git a/ChangeLog b/ChangeLog
index 8008b67419bd4e92b8a6ac32916e6093a6aaf007..7fb7e7dbb39c9b389aa0aaba3102cde10805911f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.160 2005/01/28 20:23:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.161 2005/01/28 20:53:39 wolf31o2 Exp $
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript/hppa-archscript.sh, livecd/runscript/sparc-archscript.sh,
+  livecd/runscript/sparc64-archscript.sh:
+  Force devfs if udev is not selected for all supporting arches.
 
   28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/alpha-archscript.sh, livecd/runscript/x86-archscript.sh,

diff --git a/livecd/runscript/hppa-archscript.sh b/livecd/runscript/hppa-archscript.sh
index aab0de4098280c60fa219f21b7fcb11a49e59907..557625c0d783a994c52ed423500534002598fccd 100644 (file)
--- a/livecd/runscript/hppa-archscript.sh
+++ b/livecd/runscript/hppa-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/hppa-archscript.sh,v 1.6 2004/12/12 16:39:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/hppa-archscript.sh,v 1.7 2005/01/28 20:53:39 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -39,6 +39,14 @@ case $1 in
                        [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
                        tar xjvf ${kbinary} -C ${clst_cdroot_path}/boot
                done
+
+               # figure out what device manager we are using and handle it accordingly
+               if [ "${clst_livecd_devmanager}" == "udev" ]
+               then
+                       cmdline_opts="${cmdline_opts} udev nodevfs"
+               else
+                       cmdline_opts="${cmdline_opts} noudev devfs"
+               fi
                
                # THIS SHOULD BE IMPROVED !
                mv ${clst_cdroot_path}/boot/kernel* ${clst_cdroot_path}/vmlinux

diff --git a/livecd/runscript/sparc-archscript.sh b/livecd/runscript/sparc-archscript.sh
index 3e09b9300136387610d05fb2eea972357cc4cea9..e5677010b610b744a33624c003428d18cba45757 100644 (file)
--- a/livecd/runscript/sparc-archscript.sh
+++ b/livecd/runscript/sparc-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.7 2004/12/12 16:39:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.8 2005/01/28 20:53:39 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -45,6 +45,14 @@ case $1 in
                        # change initrd name from "initrd" to "gentoo.igz", for example
                        mv ${clst_cdroot_path}/boot/initrd* ${clst_cdroot_path}/boot/${x}.igz
                done
+
+               # figure out what device manager we are using and handle it accordingly
+               if [ "${clst_livecd_devmanager}" == "udev" ]
+               then
+                       cmdline_opts="${cmdline_opts} udev nodevfs"
+               else
+                       cmdline_opts="${cmdline_opts} noudev devfs"
+               fi
                
                scfg=${clst_cdroot_path}/boot/silo.conf
                echo "default=\"help\"" > ${scfg}

diff --git a/livecd/runscript/sparc64-archscript.sh b/livecd/runscript/sparc64-archscript.sh
index c3b8c85232f676f81bd181eda621785c0aa1f42f..3f6816889c045c60f4c3c6378e14c3bfcf5df431 100644 (file)
--- a/livecd/runscript/sparc64-archscript.sh
+++ b/livecd/runscript/sparc64-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.9 2004/12/12 16:39:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.10 2005/01/28 20:53:39 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -45,6 +45,14 @@ case $1 in
                        # change initrd name from "initrd" to "gentoo.igz", for example
                        mv ${clst_cdroot_path}/boot/initrd* ${clst_cdroot_path}/boot/${x}.igz
                done
+
+               # figure out what device manager we are using and handle it accordingly
+               if [ "${clst_livecd_devmanager}" == "udev" ]
+               then
+                       cmdline_opts="${cmdline_opts} udev nodevfs"
+               else
+                       cmdline_opts="${cmdline_opts} noudev devfs"
+               fi
                
                scfg=${clst_cdroot_path}/boot/silo.conf
                echo "default=\"help\"" > ${scfg}