Fixed up spacing/coding style on livecd-stage*.

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

diff --git a/ChangeLog b/ChangeLog
index 2ff34a43c092c6e07e5d8c774f628cdf63334882..9017b67668c2a2255a2ae94574f29ac40d6b74a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.461 2005/12/16 19:14:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.462 2005/12/16 19:32:31 wolf31o2 Exp $
+
+  16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-controller.sh,
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Fixed up spacing/coding style on livecd-stage*.
 
   16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/grp/grp-chroot.sh, targets/grp/grp-controller.sh,

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index b668cabac22ad15ad7c90d474716032ac210d33c..beb172b7476ef1cfb8045cac9922b73d9334dbe9 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.22 2005/12/09 19:03:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.23 2005/12/16 19:32:31 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -10,14 +10,14 @@ update_env_settings
 setup_myfeatures
 setup_myemergeopts
 
-## setup the environment
+# Setup the environment
 
 export FEATURES="${clst_myfeatures}"
 
 ## START BUILD
 setup_portage
 
-#turn off auto-use:
+# Turn off auto-use:
 export USE_ORDER="env:pkg:conf:defaults"       
 export USE="${clst_use}"
 

diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index 76420e4503aad5568d55ed08ebe0673af430e0c3..9c2f65d86ff00fd45ba820010bbd4de2bf9bcd93 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -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/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.9 2005/09/08 20:59:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.10 2005/12/16 19:32:31 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -16,9 +16,9 @@ case $1 in
                        echo "${clst_packages}" > \
                                ${clst_chroot_path}/usr/livecd/grppkgs.txt
                fi
-               exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+               exec_in_chroot \
+                       ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
                ;;
-
        clean)
                find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \;
                ;;

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index f4fe24426dc07706c8c2ce1c4bef7ec544bf4dd5..8bd5c4de66bac23ee9d6b9dcbb54f02fea436b61 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,6 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.17 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.18 2005/12/16 19:32:31 wolf31o2 Exp $
+
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -20,7 +21,7 @@ case $1 in
                # if we have our own linuxrc, copy it in
                if [ -n "${clst_linuxrc}" ]
                then
-                       cp -a ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
+                       cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
                fi
                exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
                delete_from_chroot tmp/linuxrc
@@ -32,12 +33,12 @@ case $1 in
                ;;
 
        preclean)
-               # move over the motd (if applicable)
+               # Move over the motd (if applicable)
                if [ -n "${clst_livecd_motd}" ]
                then
-                       cp -a ${clst_livecd_motd} ${clst_chroot_path}/etc/motd
+                       cp -pPR ${clst_livecd_motd} ${clst_chroot_path}/etc/motd
                else
-                       cp -a ${clst_sharedir}/livecd/files/generic.motd.txt \
+                       cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \
                                ${clst_sharedir}/livecd/files/universal.motd.txt \
                                ${clst_sharedir}/livecd/files/minimal.motd.txt \
                                ${clst_sharedir}/livecd/files/livecd.motd.txt \
@@ -66,15 +67,16 @@ case $1 in
                fi
                ;;
        livecd-update)
-               # now, finalize and tweak the livecd fs (inside of the chroot)
+               # Now, finalize and tweak the livecd fs (inside of the chroot)
                exec_in_chroot  ${clst_sharedir}/targets/support/livecdfs-update.sh
                
                
-               # move over the xinitrc (if applicable)
-               # this is moved here, so we can override any default xinitrc
+               # Move over the xinitrc (if applicable)
+               # Tthis is moved here, so we can override any default xinitrc
                if [ -n "${clst_livecd_xinitrc}" ]
                then
-                       cp -f ${clst_livecd_xinitrc} ${clst_chroot_path}/etc/X11/xinit/xinitrc
+                       cp -f ${clst_livecd_xinitrc} \
+                               ${clst_chroot_path}/etc/X11/xinit/xinitrc
                fi
                ;;
        rc-update)
@@ -83,17 +85,15 @@ case $1 in
        fsscript)
                exec_in_chroot ${clst_fsscript}
                ;;
-
        clean)
                find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \;
                ;;
-
        bootloader)
                shift
                # Here is where we poke in our identifier
                touch $1/livecd
                
-               # move over the readme (if applicable)
+               # Move over the readme (if applicable)
                if [ -n "${clst_livecd_readme}" ]
                then
                        cp -f ${clst_livecd_readme} $1/README.txt
@@ -101,7 +101,7 @@ case $1 in
                        cp -f ${clst_sharedir}/livecd/files/README.txt $1
                fi
 
-               # move over Getting_Online.txt for minimal/GameCD
+               # 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" ]
@@ -111,18 +111,15 @@ case $1 in
                
                ${clst_sharedir}/targets/support/bootloader-setup.sh $1
                ;;
-    
     unmerge)
         shift
         export clst_packages="$*"
         exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
     ;;
-
        target_image_setup)
                shift
                ${clst_sharedir}/targets/support/target_image_setup.sh $1
                ;;
-
        iso)
                shift
                ${clst_sharedir}/targets/support/create-iso.sh $1