From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 3 Mar 2005 22:36:08 +0000 (+0000)
Subject: Added a new empty livecd file to each archscript.  This will be used for an identifie... 
X-Git-Tag: CATALYST_2_0_6_916~819
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=029da4e4c099d530129da6ecf44fd060bb6cf7b7;p=catalyst.git

Added a new empty livecd file to each archscript.  This will be used for an identifier by genkernel to allow booting from a non-primary CDROM.


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

diff --git a/ChangeLog b/ChangeLog
index 7095d752..66f105f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.179 2005/03/03 22:05:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.180 2005/03/03 22:36:08 wolf31o2 Exp $
+
+  03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh,
+  livecd/runscript/ppc-archscript.sh, livecd/runscript/sparc-archscript.sh,
+  livecd/runscript/sparc64-archscript.sh,
+  livecd/runscript/x86-archscript.sh:
+  Added a new empty livecd file to each archscript. This will be used for an
+  identifier by genkernel to allow booting from a non-primary CDROM.
 
   03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst:
   Catalyst 1.1.6 is here.
diff --git a/livecd/runscript/alpha-archscript.sh b/livecd/runscript/alpha-archscript.sh
index 23691cd0..728fc295 100755
--- a/livecd/runscript/alpha-archscript.sh
+++ b/livecd/runscript/alpha-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/alpha-archscript.sh,v 1.8 2005/01/29 04:05:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/alpha-archscript.sh,v 1.9 2005/03/03 22:36:08 wolf31o2 Exp $
 
 case $1 in
 	kernel)
@@ -24,7 +24,8 @@ case $1 in
 		cdtar=${clst_livecd_cdtar}
 		[ -z "$cdtar" ] && die "Required key livecd/cdtar not specified, exiting"
 		tar xjpvf ${cdtar} -C ${clst_cdroot_path} || die "Couldn't extract cdtar ${cdtar}"
-		
+		# Here is where we poke in our identifier
+		touch ${clst_cdroot_path}/livecd
 		[ -z "${clst_boot_kernel}" ] && die "Required key boot/kernel not specified, exiting"
 		
 		# unpack the kernel(s) that were built in kmerge.sh
diff --git a/livecd/runscript/hppa-archscript.sh b/livecd/runscript/hppa-archscript.sh
index 557625c0..aa0aae7a 100644
--- 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.7 2005/01/28 20:53:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/hppa-archscript.sh,v 1.8 2005/03/03 22:36:08 wolf31o2 Exp $
 
 case $1 in
 	kernel)
@@ -23,7 +23,8 @@ case $1 in
 		cdtar=${clst_livecd_cdtar}
 		[ -z "$cdtar" ] && die "Required key livecd/cdtar not specified, exiting"
 		tar xjpvf ${cdtar} -C ${clst_cdroot_path} || die "Couldn't extract cdtar ${cdtar}"
-		
+		# Here is where we poke in our identifier
+		touch ${clst_cdroot_path}/livecd
 		[ -z "$clst_boot_kernel" ] && die "Required key boot/kernel not specified, exiting"
 		
 		# install our kernel(s) that were built in kmerge.sh
diff --git a/livecd/runscript/ppc-archscript.sh b/livecd/runscript/ppc-archscript.sh
index 40e9268a..e01cd4cd 100644
--- a/livecd/runscript/ppc-archscript.sh
+++ b/livecd/runscript/ppc-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/ppc-archscript.sh,v 1.5 2004/10/15 02:40:00 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/ppc-archscript.sh,v 1.6 2005/03/03 22:36:08 wolf31o2 Exp $
 
 case $1 in
 	kernel)
@@ -29,7 +29,8 @@ case $1 in
 		cdtar=${clst_livecd_cdtar}
 		[ -z "${cdtar}" ] && die "Required key livecd/cdtar not defined, exiting"
 		tar xjpvf ${cdtar} -C ${clst_cdroot_path} || die "Couldn't extract cdtar ${cdtar}"
-		
+		# Here is where we poke in our identifier
+		touch ${clst_cdroot_path}/livecd
 		[ -z "${clst_boot_kernel}" ] && die "Required key boot/kernel not defined, exiting."
 		
 		first=""
diff --git a/livecd/runscript/sparc-archscript.sh b/livecd/runscript/sparc-archscript.sh
index e5677010..7e92593f 100644
--- 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.8 2005/01/28 20:53:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.9 2005/03/03 22:36:08 wolf31o2 Exp $
 
 case $1 in
 	kernel)
@@ -21,7 +21,8 @@ case $1 in
 		cdtar=${clst_livecd_cdtar}
 		[ -z "$cdtar" ] && die "Required key livecd/cdtar not defined, exiting"
 		tar xjpvf ${cdtar} -C ${clst_cdroot_path} || die "Couldn't extract cdtar ${cdtar}"
-		
+		# Here is where we poke in our identifier
+		touch ${clst_cdroot_path}/livecd
 		[ -z "$clst_boot_kernel" ] && die "Required key boot/kernel not defined, exiting"
 		
 		# install the kernels built in kmerge.sh
diff --git a/livecd/runscript/sparc64-archscript.sh b/livecd/runscript/sparc64-archscript.sh
index 3f681688..15f17963 100644
--- 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.10 2005/01/28 20:53:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.11 2005/03/03 22:36:08 wolf31o2 Exp $
 
 case $1 in
 	kernel)
@@ -21,7 +21,8 @@ case $1 in
 		cdtar=${clst_livecd_cdtar}
 		[ -z "$cdtar" ] && die "Required key livecd/cdtar not defined, exiting"
 		tar xjpvf ${cdtar} -C ${clst_cdroot_path} || die "Couldn't extract cdtar ${cdtar}"
-		
+		# Here is where we poke in our identifier
+		touch ${clst_cdroot_path}/livecd
 		[ -z "$clst_boot_kernel" ] && die "Required key boot/kernel not defined, exiting"
 		
 		# install the kernels built in kmerge.sh
diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index f4189232..65fe8a73 100644
--- a/livecd/runscript/x86-archscript.sh
+++ b/livecd/runscript/x86-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/x86-archscript.sh,v 1.22 2005/01/29 14:33:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.23 2005/03/03 22:36:08 wolf31o2 Exp $
 
 case $1 in
 	kernel)
@@ -23,7 +23,8 @@ case $1 in
 		cdtar=${clst_livecd_cdtar}
 		[ -z "${cdtar}" ] && die "Required key livecd/cdtar not defined, exiting"
 		tar xjpvf ${cdtar} -C ${clst_cdroot_path} || die "Couldn't extract cdtar ${cdtar}"
-		
+		# Here is where we poke in our identifier
+		touch ${clst_cdroot_path}/livecd
 		[ -z "${clst_boot_kernel}" ] && die "Required key boot/kernel not defined, exiting."
 		
 		first=""