[gentoo-commits] catalyst r1394 - in trunk: . targets/livecd-stage2 targets/support

[Chris Gianelloni (wolf31o2)]

Author: wolf31o2
Date: 2008-04-13 15:47:55 +0000 (Sun, 13 Apr 2008)
New Revision: 1394

Modified:
   trunk/ChangeLog
   trunk/targets/livecd-stage2/livecd-stage2-controller.sh
   trunk/targets/support/kmerge.sh
   trunk/targets/support/livecdfs-update.sh
   trunk/targets/support/rc-update.sh
Log:
Change all checks for livecd/type: gentoo-release-livecd to gentoo-release-live* so we can add a new gentoo-release-livedvd livecd/type to allow for auto-fetching of distfiles and stages onto official DVD media.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-11 15:55:54 UTC (rev 1393)
+++ trunk/ChangeLog	2008-04-13 15:47:55 UTC (rev 1394)
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Apr 2008; Chris Gianelloni <wolf31o2@g.o>
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/kmerge.sh, targets/support/livecdfs-update.sh,
+  targets/support/rc-update.sh:
+  Change all checks for livecd/type: gentoo-release-livecd to
+  gentoo-release-live* so we can add a new gentoo-release-livedvd livecd/type
+  to allow for auto-fetching of distfiles and stages onto official DVD media.
+
   11 Apr 2008; Chris Gianelloni <wolf31o2@g.o> TODO,
   targets/livecd-stage1/livecd-stage1-controller.sh,
   targets/livecd-stage2/livecd-stage2-controller.sh:

Modified: trunk/targets/livecd-stage2/livecd-stage2-controller.sh
===================================================================
--- trunk/targets/livecd-stage2/livecd-stage2-controller.sh	2008-04-11 15:55:54 UTC (rev 1393)
+++ trunk/targets/livecd-stage2/livecd-stage2-controller.sh	2008-04-13 15:47:55 UTC (rev 1394)
@@ -135,28 +135,28 @@
 		fi
 
 		# Move over Getting_Online.txt for minimal/GameCD
-		if [ "${clst_livecd_type}" = "gentoo-gamecd" ] \
-		|| [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \
-		|| [ "${clst_livecd_type}" = "gentoo-release-livecd" ]
-		then
-			cp -f ${clst_sharedir}/livecd/files/Getting_Online.txt $1
-		fi
+		case ${clst_livecd_type} in
+			gentoo-gamecd|gentoo-release-minimal|gentoo-release-live*)
+				cp -f ${clst_sharedir}/livecd/files/Getting_Online.txt $1
+			;;
+		esac
 
-		if [ "${clst_livecd_type}" = "gentoo-release-livecd" ]
-		then
-			mkdir -p $1/snapshots
-			if [ -n "${clst_livecd_overlay}" ]
-			then
-				if [ -e ${clst_livecd_overlay}/snapshots/${clst_snapshot_path} ]
+		case ${clst_livecd_type} in
+			gentoo-release-live*)
+				mkdir -p $1/snapshots
+				if [ -n "${clst_livecd_overlay}" ]
 				then
-					echo "ERROR: You have a snapshot in your overlay, please"
-					echo "remove it, since catalyst adds it automatically."
-					exit 1
+					if [ -e ${clst_livecd_overlay}/snapshots/${clst_snapshot_path} ]
+					then
+						echo "ERROR: You have a snapshot in your overlay, please"
+						echo "remove it, since catalyst adds it automatically."
+						exit 1
+					fi
 				fi
-			fi
-			cp -f ${clst_snapshot_path} $1/snapshots
-			cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
-		fi
+				cp -f ${clst_snapshot_path} $1/snapshots
+				cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
+			;;
+		esac
 
 		${clst_sharedir}/targets/support/bootloader-setup.sh $1
 		;;

Modified: trunk/targets/support/kmerge.sh
===================================================================
--- trunk/targets/support/kmerge.sh	2008-04-11 15:55:54 UTC (rev 1393)
+++ trunk/targets/support/kmerge.sh	2008-04-13 15:47:55 UTC (rev 1394)
@@ -76,12 +76,15 @@
 	export clst_kernel_merge
 	export clst_initramfs_overlay
 	# Build our list of kernel packages
-	if [ "${clst_livecd_type}" = "gentoo-release-livecd" ] \
-	&& [ -n "${clst_kernel_merge}" ]
-	then
-		mkdir -p /usr/livecd
-		echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt
-	fi
+	case ${clst_livecd_type} in
+		gentoo-release-live*)
+			if [ -n "${clst_kernel_merge}" ]
+			then
+				mkdir -p /usr/livecd
+				echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt
+			fi
+		;;
+	esac
 	# Build with genkernel using the set options
 	# callback is put here to avoid escaping issues
 	gk_callback_opts="-qN"

Modified: trunk/targets/support/livecdfs-update.sh
===================================================================
--- trunk/targets/support/livecdfs-update.sh	2008-04-11 15:55:54 UTC (rev 1393)
+++ trunk/targets/support/livecdfs-update.sh	2008-04-13 15:47:55 UTC (rev 1394)
@@ -34,7 +34,7 @@
 # Since we're an official Gentoo release, we do things the official Gentoo way.
 # As such, we override livecd/users.
 case ${clst_livecd_type} in
-	gentoo-release-livecd)
+	gentoo-release-live*)
 		user_comment="Gentoo default user"
 		clst_livecd_users="gentoo"
 	;;
@@ -180,22 +180,22 @@
 
 # Tweak the MOTD for Gentoo releases 
 case ${clst_livecd_type} in
-	gentoo-release-universal )
+	gentoo-release-universal)
 		cat /etc/generic.motd.txt /etc/universal.motd.txt \
 			/etc/minimal.motd.txt > /etc/motd
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
 	;;
-	gentoo-release-minimal )
+	gentoo-release-minimal)
 		cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
 	;;
-	gentoo-release-livecd )
+	gentoo-release-live*)
 		cat /etc/generic.motd.txt \
 			/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
 		sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
 			-e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd
 	;;
-	gentoo-gamecd )
+	gentoo-gamecd)
 		cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
 	;;
@@ -261,7 +261,7 @@
 
 		touch /etc/startx
 		;;
-	gentoo-release-livecd)
+	gentoo-release-live*)
 		# Setup Gnome theme
 		if [ "${clst_livecd_xsession}" == "gnome" ]
 		then

Modified: trunk/targets/support/rc-update.sh
===================================================================
--- trunk/targets/support/rc-update.sh	2008-04-11 15:55:54 UTC (rev 1393)
+++ trunk/targets/support/rc-update.sh	2008-04-13 15:47:55 UTC (rev 1394)
@@ -27,18 +27,16 @@
 
 	# Do some livecd_type specific rc-update changes
 	case ${clst_livecd_type} in
-		gentoo-gamecd )
+		gentoo-gamecd)
 			rc-update add spind default
 			;;
-		gentoo-release-livecd )
+		gentoo-release-live*)
 			rc-update add spind default
 			rc-update add xdm default
 			;;
-		generic-livecd )
+		generic-livecd)
 			rc-update add spind default
 			;;
-		*)
-			;;
 	esac
 fi
 

-- 
gentoo-commits@l.g.o mailing list