diff options
| author | D. Johnson <fenris02@fedoraproject.org> | 2011-09-18 16:39:43 -0500 |
|---|---|---|
| committer | D. Johnson <fenris02@fedoraproject.org> | 2011-09-18 16:39:43 -0500 |
| commit | 1fac1d1a684011dc503520d6abca35182f416f20 (patch) | |
| tree | 095708bc63f4ff27d202584d8066156cd6fc2b07 /distro-clean.sh | |
| parent | 893115b05f49b2eda2f4dbbbcac8847e9634b654 (diff) | |
| download | cleanup-1fac1d1a684011dc503520d6abca35182f416f20.tar.gz cleanup-1fac1d1a684011dc503520d6abca35182f416f20.tar.xz cleanup-1fac1d1a684011dc503520d6abca35182f416f20.zip | |
More reordering to make yum stop crashing / depsolver issues.
Diffstat (limited to 'distro-clean.sh')
| -rwxr-xr-x | distro-clean.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/distro-clean.sh b/distro-clean.sh index 8bdb586..f0c519f 100755 --- a/distro-clean.sh +++ b/distro-clean.sh @@ -117,7 +117,6 @@ cat ->> $YSHELL <<EOT reinstall policycoreutils* reinstall selinux* install fpaste -install policycoreutils install redhat-lsb install rpmconf install yum-plugin-local @@ -164,10 +163,10 @@ show-installed > ${TMPDIR}/SHOW-INSTALLED1_${DS}.txt semanage -o ${TMPDIR}/SELINUX-CUSTOM-CONFIG_${DS}.txt mv /etc/selinux/targeted ${TMPDIR}/targeted.${DS} mkdir -p /etc/selinux/targeted -time yum shell $YSHELL -y --disableplugin=presto --skip-broken time yum shell $YSHELL2 -y --disableplugin=presto --skip-broken time yum shell $YSHELL3 -y --disableplugin=presto --skip-broken time yum distribution-synchronization -y --disableplugin=presto --skip-broken +time yum shell $YSHELL -y --disableplugin=presto --skip-broken [ -f /etc/PackageKit/CommandNotFound.conf ] \ && sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf @@ -277,11 +276,14 @@ EOT chmod 0700 ${TMPDIR}/raising-elephants.sh # Done -[ -n "$VERBOSE" ] && echo 'Verify packages are installed the way you want and then type ${TMPDIR}/raising-elephants.sh' +echo "Verify packages are installed the way you want and then type ${TMPDIR}/raising-elephants.sh" echo 'If you have questions, share this link.' [ -x /usr/bin/fpaste ] || yum install -y fpaste -fpaste ${TMPDIR}/{DUPLICATE-PACKAGES,FCAPS-REINSTALL,REVIEW-CONFIGS,REVIEW-OBSOLETE-CONFIGS,RPM-VA2,SELINUX-CUSTOM-CONFIG,SHOW-INSTALLED1,SHOW-INSTALLED2,URGENT-REVIEW,YUM-SHELL,YUM-SHELL2,YUM-SHELL3}_${DS}.txt +for E in ${TMPDIR}/[A-Z]*_${DS}.txt; do + [ -s $E ] || rm $E +done +fpaste ${TMPDIR}/[A-Z]*_${DS}.txt echo '' if [ -n "$LOG_ALL" ]; then |