From 52c496e4a83daff54f58d5347e2377ac040c0f05 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Wed, 8 Feb 2006 18:59:12 +0000 Subject: [PATCH] fix kernelopts and extraversion env variable exports git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1076 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/generic_stage_target.py | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 659ad2c1..4093d789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.561 2006/02/08 03:25:24 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.562 2006/02/08 18:59:12 rocket Exp $ + + 08 Feb 2006; Eric Edgar + modules/generic_stage_target.py: + fix kernelopts and extraversion env variable exports 08 Feb 2006; Chris Gianelloni catalyst, targets/support/livecdfs-update.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 608a992a..b0a7044c 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.125 2006/01/27 22:49:10 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.126 2006/02/08 18:59:12 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -1200,15 +1200,15 @@ class generic_stage_target(generic_target): if type(myopts) != types.StringType: myopts = string.join(myopts) - os.putenv(kname+"_kernelopts", myopts) + self.env[kname+"_kernelopts"]=myopts else: - os.putenv(kname+"_kernelopts", "") + self.env[kname+"_kernelopts"]="" if not self.settings.has_key("boot/kernel/"+kname+"/extraversion"): self.settings["boot/kernel/"+kname+"/extraversion"]="" - os.putenv("clst_kextraversion", self.settings["boot/kernel/"+kname+"/extraversion"]) + self.env["clst_kextraversion"]=self.settings["boot/kernel/"+kname+"/extraversion"] if self.settings.has_key("boot/kernel/"+kname+"/initramfs_overlay"): if os.path.exists(self.settings["boot/kernel/"+kname+"/initramfs_overlay"]): print "Copying initramfs_overlay dir " +self.settings["boot/kernel/"+kname+"/initramfs_overlay"] -- 2.26.2