Change all checks for livecd/type: gentoo-release-livecd to gentoo-release-live*...

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

diff --git a/ChangeLog b/ChangeLog
index 883c25bbd30ea838e995cda315fbd60e2b35d97f..bfc0bdae1841755ae40c219c63d762e43b57c45e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  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@gentoo.org> TODO,
   targets/livecd-stage1/livecd-stage1-controller.sh,
   targets/livecd-stage2/livecd-stage2-controller.sh:

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 73717f70aa455032d80d23ebc3d205f30cf3b82c..e34ffdb97255c42ee46ed904702375eebc515c4b 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -135,28 +135,28 @@ case $1 in
                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
                ;;

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 16226a6994704d8eeda7cc93c028e3b8f45e0c9f..da1b844c59163c50d7c4af6649d338d6fe97aedf 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -76,12 +76,15 @@ genkernel_compile(){
        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"

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 23a514824aea700a9f0de8947a8f37a973be806e..79863c1eaa22687e8d546d3296e5fc5c02f3887a 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -34,7 +34,7 @@ fi
 # 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 @@ touch /etc/asound.state
 
 # 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 @@ case ${clst_livecd_type} in
 
                touch /etc/startx
                ;;
-       gentoo-release-livecd)
+       gentoo-release-live*)
                # Setup Gnome theme
                if [ "${clst_livecd_xsession}" == "gnome" ]
                then

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index 21be17b27c1ab40533daa2408da673422c4fda80..c2c3d69d3a499b53af09e65f3b99fb705e268101 100644 (file)
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -27,18 +27,16 @@ then
 
        # 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