From d42089c315a9f0919dabd2343ff10491a6776ffc Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sun, 11 Jan 2009 00:36:34 -0600 Subject: [PATCH] More trailing whitespace cleanups --- ChangeLog | 15 +++++++++++++ targets/embedded/embedded-chroot.sh | 2 +- targets/embedded/embedded-controller.sh | 4 ++-- targets/grp/grp-controller.sh | 2 +- .../livecd-stage2/livecd-stage2-controller.sh | 4 ++-- targets/netboot/netboot-combine.sh | 2 +- targets/netboot/netboot-controller.sh | 2 +- targets/netboot/netboot-image.sh | 2 +- targets/netboot2/netboot2-copyfile.sh | 2 +- targets/stage1/stage1-controller.sh | 4 ++-- targets/stage4/stage4-controller.sh | 2 +- targets/support/bootloader-setup.sh | 22 +++++++++---------- targets/support/chroot-functions.sh | 10 ++++----- targets/support/create-iso.sh | 8 +++---- targets/support/filesystem-functions.sh | 2 +- targets/support/functions.sh | 18 +++++++-------- targets/support/kill-chroot-pids.sh | 10 ++++----- targets/support/kmerge.sh | 18 +++++++-------- targets/support/livecdfs-update.sh | 2 +- targets/support/mips-arcload_conf.sh | 2 +- targets/tinderbox/tinderbox-chroot.sh | 4 ++-- 21 files changed, 76 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1cde5fb..a50829db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,21 @@ # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 11 Jan 2009; Andrew Gaffney + targets/embedded/embedded-chroot.sh, + targets/embedded/embedded-controller.sh, targets/grp/grp-controller.sh, + targets/livecd-stage2/livecd-stage2-controller.sh, + targets/netboot/netboot-combine.sh, targets/netboot/netboot-controller.sh, + targets/netboot/netboot-image.sh, targets/netboot2/netboot2-copyfile.sh, + targets/stage1/stage1-controller.sh, targets/stage4/stage4-controller.sh, + targets/support/bootloader-setup.sh, targets/support/chroot-functions.sh, + targets/support/create-iso.sh, targets/support/filesystem-functions.sh, + targets/support/functions.sh, targets/support/kill-chroot-pids.sh, + targets/support/kmerge.sh, targets/support/livecdfs-update.sh, + targets/support/mips-arcload_conf.sh, + targets/tinderbox/tinderbox-chroot.sh: + More trailing whitespace cleanups + 11 Jan 2009; Andrew Gaffney modules/catalyst/arch/arm.py, modules/catalyst/arch/mips.py, modules/catalyst/arch/x86.py, modules/catalyst/config.py, diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh index 89e834c5..2fbba278 100644 --- a/targets/embedded/embedded-chroot.sh +++ b/targets/embedded/embedded-chroot.sh @@ -10,6 +10,6 @@ echo "Installing dependencies into ${DESTROOT}..." run_merge -o "${clst_embedded_packages}" export clst_root_path="${DESTROOT}" -export INSTALL_MASK="${clst_install_mask}" +export INSTALL_MASK="${clst_install_mask}" run_merge -1 -O "${clst_embedded_packages}" diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh index a1a82d06..e5c44914 100644 --- a/targets/embedded/embedded-controller.sh +++ b/targets/embedded/embedded-controller.sh @@ -20,7 +20,7 @@ case ${1} in # package) # export root_fs_path="${clst_chroot_path}/tmp/mergeroot" # install -d ${clst_image_path} - + # ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \ # ${clst_embedded_fs_type} || exit 1 # imagesize=`du -sk ${clst_image_path}/root.img | cut -f1` @@ -68,7 +68,7 @@ case ${1} in ${clst_sharedir}/targets/support/bootloader-setup.sh ${1} ;; - + iso) shift ${clst_sharedir}/targets/support/create-iso.sh ${1} diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh index 5069777c..22b37079 100644 --- a/targets/grp/grp-controller.sh +++ b/targets/grp/grp-controller.sh @@ -24,7 +24,7 @@ case $1 in clean) exit 0 ;; - + *) exit 1 ;; diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index fbdeac2b..36c7cffd 100644 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -53,7 +53,7 @@ case $1 in fi ;; esac - + # move over the environment cp -f ${clst_sharedir}/livecd/files/livecd-bashrc \ ${clst_chroot_path}/root/.bashrc @@ -61,7 +61,7 @@ case $1 in ${clst_chroot_path}/root/.bash_profile cp -f ${clst_sharedir}/livecd/files/livecd-local.start \ ${clst_chroot_path}/etc/conf.d/local.start - + # execute copy gamecd.conf if we're a gamecd if [ "${clst_livecd_type}" = "gentoo-gamecd" ] then diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh index ad3916cd..3ff154c9 100644 --- a/targets/netboot/netboot-combine.sh +++ b/targets/netboot/netboot-combine.sh @@ -53,7 +53,7 @@ do alpha) # Until aboot is patched this is broken currently. # please use catalyst 1.1.5 or older - + #TEST TEST TEST TEST #http://lists.debian.org/debian-alpha/2004/07/msg00094.html #make \ diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh index c3fc0914..b48c6aab 100644 --- a/targets/netboot/netboot-controller.sh +++ b/targets/netboot/netboot-controller.sh @@ -20,7 +20,7 @@ case ${1} in mkdir -p ${clst_chroot_path}/etc/busybox/${clst_CHOST} cp -v ${clst_netboot_busybox_config} \ ${clst_chroot_path}/etc/busybox/${clst_CHOST}/busybox.config - clst_use="savedconfig" + clst_use="savedconfig" fi # Main Busybox emerge diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh index 90bb704a..10bdaed3 100644 --- a/targets/netboot/netboot-image.sh +++ b/targets/netboot/netboot-image.sh @@ -7,7 +7,7 @@ update_env_settings echo "Copying files to ${clst_root_path}" clst_files="/bin/busybox ${clst_files} " for f in ${clst_files} -do +do copy_file ${f} done echo "Done copying files" diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh index 1d0290e2..cc1a1181 100644 --- a/targets/netboot2/netboot2-copyfile.sh +++ b/targets/netboot2/netboot2-copyfile.sh @@ -7,7 +7,7 @@ update_env_settings echo ">>> Copying initramfs files to ${clst_merge_path} (in chroot) ..." [ ! -d "${clst_merge_path}" ] && mkdir -p ${clst_merge_path} for f in ${clst_files} -do +do # copy it to the merge path cp -pPRf --parents $(eval echo ${f}) ${clst_merge_path} diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 56258772..1eecc5c7 100644 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -7,10 +7,10 @@ case $1 in ;; run) cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp - + # Setup "ROOT in chroot" dir install -d ${clst_chroot_path}/${clst_root_path}/etc - + # Setup make.conf and make.profile link in "ROOT in chroot": copy_to_chroot ${clst_chroot_path}/etc/make.conf /${clst_root_path}/etc copy_to_chroot ${clst_chroot_path}/etc/make.profile \ diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh index d95728eb..4e594fa6 100644 --- a/targets/stage4/stage4-controller.sh +++ b/targets/stage4/stage4-controller.sh @@ -66,7 +66,7 @@ case $1 in unmerge) shift export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh + exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh ;; iso) shift diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 66f03542..d8c31950 100644 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -57,27 +57,27 @@ case ${clst_hostarch} in echo "fgcolor=white" >> ${icfg} echo "bgcolor=black" >> ${icfg} echo "message=/boot/boot.msg" >> ${icfg} - + # Here is where I fix up the boot.msg file. sed -e 's/ARCH/PowerPC/' \ -e 's/HARDWARE/Apple and IBM hardware/' \ -i $kmsg - # Setup the IBM yaboot.conf + # Setup the IBM yaboot.conf etc_icfg=$1/etc/yaboot.conf - mkdir -p $1/etc + mkdir -p $1/etc IBM_YABOOT="FALSE" echo "root=/dev/ram" >> ${etc_icfg} echo "fgcolor=white" >> ${etc_icfg} echo "bgcolor=black" >> ${etc_icfg} echo "message=/boot/boot.msg" >> ${etc_icfg} - + for x in ${clst_boot_kernel} - do + do eval "clst_kernel_console=\$clst_boot_kernel_${x}_console" eval "clst_kernel_machine_type=\$clst_boot_kernel_${x}_machine_type" eval custom_kopts=\$${x}_kernelopts - + echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" if [ "${clst_kernel_machine_type}" == "ibm" ] then @@ -140,7 +140,7 @@ case ${clst_hostarch} in echo "label=${x}" >> ${icfg} echo "read-write" >> ${icfg} echo "append=\"${default_append_line}\"" >> ${icfg} - + for y in ${clst_kernel_console} do echo >> ${icfg} @@ -172,7 +172,7 @@ case ${clst_hostarch} in done if [ "${IBM_YABOOT}" == "FALSE" ] - then + then rm ${etc_kmsg} rmdir $1/etc if [ -d $1/ppc ] @@ -267,7 +267,7 @@ case ${clst_hostarch} in eval custom_kopts=\$${x}_kernelopts echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" echo >> ${icfg} - + eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel" if [ -n "${clst_kernel_softlevel}" ] @@ -358,9 +358,9 @@ case ${clst_hostarch} in eval custom_kopts=\$${x}_kernelopts echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" echo >> ${icfg} - + eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel" - + if [ -n "${clst_kernel_softlevel}" ] then for y in ${clst_kernel_softlevel} diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index f91f53cd..d2678062 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -228,7 +228,7 @@ make_destpath() { # ROOT is / by default, so remove any ROOT= settings from make.conf sed -i '/ROOT=/d' /etc/make.conf export ROOT=/ - if [ "${1}" != "/" -a -n "${1}" ] + if [ "${1}" != "/" -a -n "${1}" ] then echo "ROOT=\"${1}\"" >> /etc/make.conf export ROOT=${1} @@ -243,8 +243,8 @@ run_merge() { # Sets up the ROOT= parameter # with no options ROOT=/ make_destpath ${clst_root_path} - - export EMERGE_WARNING_DELAY=0 + + export EMERGE_WARNING_DELAY=0 export CLEAN_DELAY=0 export EBEEP_IGNORE=0 export EPAUSE_IGNORE=0 @@ -341,7 +341,7 @@ function copy_symlink() { STACK=${2} [ "${STACK}" = "" ] && STACK=16 || STACK=$((${STACK} - 1 )) - if [ ${STACK} -le 0 ] + if [ ${STACK} -le 0 ] then echo "WARNING : ${TARGET} : too many levels of symbolic links !" return @@ -351,7 +351,7 @@ function copy_symlink() { mkdir -p ${clst_root_path}/`dirname ${1}` [ ! -e ${clst_root_path}/${1} ] && \ cp -vfdp ${1} ${clst_root_path}/${1} - + if [[ -n $(type -p realpath) ]]; then TARGET=`realpath ${1}` else diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 5a6323ca..e1a671c0 100644 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -205,7 +205,7 @@ case ${clst_hostarch} in # should be in the cdtar, otherwise use the new style. if [ -x ${clst_target_path}/boot/mkisofs.sparc.fu ] then - mv ${clst_target_path}/boot/mkisofs.sparc.fu /tmp + mv ${clst_target_path}/boot/mkisofs.sparc.fu /tmp echo "Running mkisofs.sparc.fu to create iso image...." echo "/tmp/mkisofs.sparc.fu ${mkisofs_zisofs_opts} -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -V \"${clst_iso_volume_id}\" ${clst_target_path}" /tmp/mkisofs.sparc.fu ${mkisofs_zisofs_opts} -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -V "${clst_iso_volume_id}" ${clst_target_path} || die "Cannot make ISO image" @@ -281,9 +281,9 @@ case ${clst_hostarch} in elif [ -e ${clst_target_path}/gentoo.efimg ] then echo 'Creating ISO using EFI bootloader' - echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" - mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image" - else + echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" + mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image" + else echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}" mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image" fi diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh index 31ad6d35..98fd5fe3 100644 --- a/targets/support/filesystem-functions.sh +++ b/targets/support/filesystem-functions.sh @@ -27,7 +27,7 @@ create_normal_loop() { || die "Couldn't mount loopback ext2 filesystem" sync; sync; sleep 3 # Try to work around 2.6.0+ loopback bug echo "cp -pPR ${source_path}/* ${destination_path}/loopmount" - cp -pPR ${source_path}/* ${destination_path}/loopmount + cp -pPR ${source_path}/* ${destination_path}/loopmount [ $? -ne 0 ] && { umount ${destination_path}/${loopname}; \ die "Couldn't copy files to loopback ext2 filesystem"; } umount ${destination_path}/loopmount \ diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 429485b3..0bc5d69c 100644 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -37,14 +37,14 @@ exec_in_chroot(){ chroot_path=${clst_chroot_path}${subdir} copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \ ${subdir}/tmp/ - echo "Running ${file_name} in chroot ${chroot_path}" + echo "Running ${file_name} in chroot ${chroot_path}" ${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1 else copy_to_chroot ${1} tmp/ chroot_path=${clst_chroot_path} copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \ tmp/ - echo "Running ${file_name} in chroot ${chroot_path}" + echo "Running ${file_name} in chroot ${chroot_path}" ${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1 fi @@ -97,12 +97,12 @@ extract_kernels() { [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}" mkdir -p ${1}/ - tar xjf ${kbinary} -C ${1}/ + tar xjf ${kbinary} -C ${1}/ # change config name from "config-*" to "gentoo", for example #mv ${1}/config-* ${1}/${x}-config - rm ${1}/config-* - + rm ${1}/config-* + # change kernel name from "kernel" to "gentoo", for example if [ -e ${1}/kernel-* ] then @@ -117,12 +117,12 @@ extract_kernels() { # change initrd name from "initrd" to "gentoo.igz", for example if [ -e ${1}/initrd-* ] - then + then mv ${1}/initrd-* ${1}/${x}.igz fi if [ -e ${1}/initramfs-* ] - then + then mv ${1}/initramfs-* ${1}/${x}.igz fi @@ -135,7 +135,7 @@ extract_kernels() { extract_modules() { # $1 = Destination - # $2 = kname + # $2 = kname kmodules="${clst_chroot_path}/tmp/kerncache/${2}-modules-${clst_version_stamp}.tar.bz2" if [ -f "${kmodules}" ] @@ -208,7 +208,7 @@ check_filesystem_type(){ cmdline_opts="${cmdline_opts} looptype=cramfs loop=/image.cramfs" ;; esac -} +} run_crossdev() { crossdev ${clst_CHOST} diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh index 9e8bf01d..ea8ee402 100644 --- a/targets/support/kill-chroot-pids.sh +++ b/targets/support/kill-chroot-pids.sh @@ -41,17 +41,17 @@ then echo echo "Killing process(es)" echo "pid: process name" - for pid in ${pids[@]} - do + for pid in ${pids[@]} + do P_NAME=$(ls -la --color=never /proc/${pid} 2>&1 |grep exe|grep ${clst_chroot_path}|awk '{print $11}') echo ${pid}: ${P_NAME} done - echo + echo echo "Press Ctrl-C within 10 seconds to abort" - + sleep 10 - for pid in ${pids[@]} + for pid in ${pids[@]} do kill -9 ${pid} done diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index d3201bb7..b191e8f0 100644 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -49,7 +49,7 @@ setup_gk_args() { then GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc" fi - + if [ -n "${clst_linuxrc}" ] then GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc" @@ -77,7 +77,7 @@ genkernel_compile(){ setup_gk_args #echo "The GK_ARGS are" - #echo ${GK_ARGS} + #echo ${GK_ARGS} export clst_kernel_merge export clst_initramfs_overlay # Build our list of kernel packages @@ -141,15 +141,15 @@ fi # USE variables (and thus different patches enabled/disabled.) Also, there's no # real benefit in using the pkgcache for kernel source ebuilds. -USE_MATCH=0 +USE_MATCH=0 if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ] then STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort) STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort) if [ "${STR1}" = "${STR2}" ] - then + then #echo "USE Flags match" - USE_MATCH=1 + USE_MATCH=1 else if [ -n "${clst_KERNCACHE}" ] then @@ -167,7 +167,7 @@ then STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION` STR2=${clst_kextraversion} if [ "${STR1}" = "${STR2}" ] - then + then if [ -n "${clst_KERNCACHE}" ] then #echo "EXTRAVERSION match" @@ -182,7 +182,7 @@ then STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG` STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'` if [ "${STR1}" = "${STR2}" ] - then + then if [ -n "${clst_KERNCACHE}" ] then #echo "CONFIG match" @@ -204,7 +204,7 @@ then mkdir -p /etc/portage/profile echo "${KERNELVERSION}" > /etc/portage/profile/package.provided else - if ( ! grep -q "^${KERNELVERSION}\$" /etc/portage/profile/package.provided ) + if ( ! grep -q "^${KERNELVERSION}\$" /etc/portage/profile/package.provided ) then echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided fi @@ -226,7 +226,7 @@ then echo "Setting extraversion to ${clst_kextraversion}" sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION - else + else touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION fi fi diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index a03335a9..ebe17fc4 100644 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -178,7 +178,7 @@ fi # touch /etc/asound.state touch /etc/asound.state -# Tweak the MOTD for Gentoo releases +# Tweak the MOTD for Gentoo releases case ${clst_livecd_type} in gentoo-release-universal) cat /etc/generic.motd.txt /etc/universal.motd.txt \ diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh index 29692b4a..cecddd98 100644 --- a/targets/support/mips-arcload_conf.sh +++ b/targets/support/mips-arcload_conf.sh @@ -37,7 +37,7 @@ serial="serial {\n\ dbg="debug {\n\ \tdescription\t\"Debug Shell\";\n\ \timage\t\t\"\";\n\ -\tappend\t\t\"real_root=shell\" \"nox\";\n}\n\n" +\tappend\t\t\"real_root=shell\" \"nox\";\n}\n\n" cmt1="comment\t\t\"\\\n\\\n\";\n\ comment\t\t\"Bootable Images & Options:\\\n\\\r\\\n\\\r\";\n" diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 6bdaaaa0..4ebc2cc3 100644 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -8,7 +8,7 @@ setup_pkgmgr # Backup pristine system rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \ - /tmp/rsync-bak/ + /tmp/rsync-bak/ for x in ${clst_tinderbox_packages} do @@ -30,7 +30,7 @@ do if [ "$?" != "0" ] then - echo "! $x" >> /tmp/tinderbox.log + echo "! $x" >> /tmp/tinderbox.log else echo "$x" >> /tmp/tinderbox.log fi -- 2.26.2