aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-03-09 00:22:05 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-03-09 00:22:05 +0000
commit70867320238e6951817b0573d04c09eaf81e9e96 (patch)
treed45a753d301ef75e3b88c44ab1dd070ba096f5f3 /modules
parentAdding experimental isolinux cdtar for isolinux 2.13 and memtest86+ 1.51. (diff)
downloadcatalyst-70867320238e6951817b0573d04c09eaf81e9e96.tar.gz
catalyst-70867320238e6951817b0573d04c09eaf81e9e96.tar.bz2
catalyst-70867320238e6951817b0573d04c09eaf81e9e96.zip
Added livecd/volid to set the volume ID when creating the ISO, patch by Gustavo Zacarias <gustavoz@gentoo.org>. Also copied sparc64-archscript.sh to sparc-archscript.sh and removing sparc64 one, as they are identical now.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@562 d1e1f19c-881f-0410-ab34-b69fee027534
Diffstat (limited to 'modules')
-rw-r--r--modules/livecd_stage2_target.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index 5c1ac3bc..ec6da48c 100644
--- 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.29 2005/01/10 01:05:59 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.30 2005/03/09 00:22:05 wolf31o2 Exp $
"""
Builder class for a LiveCD stage2 build.
@@ -47,6 +47,12 @@ class livecd_stage2_target(generic_stage_target):
file_locate(self.settings, ["livecd/cdtar","livecd/archscript","livecd/runscript"])
if self.settings.has_key("portage_confdir"):
file_locate(self.settings,["portage_confdir"],expand=0)
+
+ if self.settings.has_key("livecd/volid"):
+ self.volumeid = string.join(self.settings["livecd/volid"])
+ if len(self.volumeid)>32:
+ raise CatalystError,"ISO volume id must not exceed 32 characters."
+ os.putenv("iso_volume_id",self.volumeid);
def unpack_and_bind(self):
if not os.path.exists(self.settings["chroot_path"]):