Added livecd/bootargs and added the option to the bootloader-setup.sh script to allow...

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

diff --git a/ChangeLog b/ChangeLog
index 8e925fbb659b7c66320093665ee09b519e232f59..4f9a98b6315e3687b94dedfd755f6118b7801181 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.280 2005/06/27 16:14:49 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.281 2005/06/28 17:32:35 wolf31o2 Exp $
+
+  28 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/livecd_stage2_target.py, targets/support/bootloader-setup.sh,
+  targets/support/functions.sh:
+  Added livecd/bootargs and added the option to the bootloader-setup.sh script
+  to allow it to work on all arches that dynamically build their bootloader
+  configuration.
 
   27 Jun 2005; Eric Edgar <rocket@gentoo.org>
   targets/stage4/stage4-controller.sh:

diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index a8d29dd069b79290130b08e2c8297645d8f41d59..cec5beabc66cb98979bc3c112e0e7be86c531fed 100644 (file)
--- a/modules/livecd_stage2_target.py
+++ b/modules/livecd_stage2_target.py
@@ -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/modules/livecd_stage2_target.py,v 1.43 2005/05/25 19:15:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.44 2005/06/28 17:32:35 wolf31o2 Exp $
 
 """
 Builder class for a LiveCD stage2 build.
@@ -23,7 +23,7 @@ class livecd_stage2_target(generic_stage_target):
                        "livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\
                        "livecd/root_overlay","livecd/devmanager","livecd/splash_type",\
                        "gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype",\
-                       "livecd/linuxrc"])
+                       "livecd/linuxrc","livecd/bootargs"])
                
                generic_stage_target.__init__(self,spec,addlargs)
                if not self.settings.has_key("livecd/type"):

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index bddb6adf1da8d6d99144618bbef3861e046b973c..c7886383c66ee82584fbab7e28cd6437d2b02277 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.6 2005/06/24 22:09:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.7 2005/06/28 17:32:35 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -10,6 +10,7 @@
 extract_cdtar $1
 extract_kernels $1/boot
 check_dev_manager
+check_bootargs
 check_filesystem_type
 
 default_append_line="initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot"

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0b18da18cc2ced670b94b8f20b5446a0e74826a8..98afe3f3bd841ef172199747852d7e666dded75f 100755 (executable)
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -152,11 +152,23 @@ check_dev_manager(){
        if [ "${clst_livecd_devmanager}" == "devfs" ]
        then
                cmdline_opts="${cmdline_opts} noudev devfs"
-       else
+       elif [ "${clst_livecd_devmanager}" == "devfs" ]
+       then
                cmdline_opts="${cmdline_opts} udev nodevfs"
        fi
 }
 
+check_bootargs(){
+       # Add any additional options
+       if [ -z "${clst_livecd_bootargs}" ]
+       then
+               for x in ${clst_livecd_bootargs}
+               do
+                       cmdline_opts="${cmdline_opts} ${x}"
+               done
+       fi
+}
+
 check_filesystem_type(){
        case ${clst_fstype} in
                normal)