diff options
| author | D. Johnson <fenris02@fedoraproject.org> | 2011-09-17 21:53:13 -0500 |
|---|---|---|
| committer | D. Johnson <fenris02@fedoraproject.org> | 2011-09-17 21:53:13 -0500 |
| commit | 04f4b9f22973ae04dc4255b633cd590acbd8b46d (patch) | |
| tree | 9f256ab917544f7b98dcb4943023073fb63ba6b9 /distro-clean.sh | |
| parent | 5d46f781e91a3162b2ec11388639becc848fe81f (diff) | |
| download | cleanup-04f4b9f22973ae04dc4255b633cd590acbd8b46d.tar.gz cleanup-04f4b9f22973ae04dc4255b633cd590acbd8b46d.tar.xz cleanup-04f4b9f22973ae04dc4255b633cd590acbd8b46d.zip | |
Break up yum-shell run so that it errrors out on smaller portions
instead of the entire set.
Diffstat (limited to 'distro-clean.sh')
| -rwxr-xr-x | distro-clean.sh | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/distro-clean.sh b/distro-clean.sh index 60dc31c..5d5d8db 100755 --- a/distro-clean.sh +++ b/distro-clean.sh @@ -77,9 +77,9 @@ done # echo "Repairing permissions" [ -n "$DEBUG" ] && read -echo "This may take a minute or two, resetting user/group ownership" +echo "This may take a few minutes, resetting user/group ownership" time rpm -a --setugids > /dev/null 2>&1 -echo "This may take a minute or two, resetting permissions" +echo "This may take a few minutes, resetting permissions" time rpm -a --setperms > /dev/null 2>&1 [ -x /usr/bin/package-cleanup ] || yum install -y yum-utils @@ -115,6 +115,17 @@ package-cleanup -q --dupes > ${TMPDIR}/DUPLICATE-PACKAGES_${DS}.txt cat ->> $YSHELL <<EOT reinstall policycoreutils* reinstall selinux* +install fpaste +install policycoreutils +install redhat-lsb +install rpmconf +EOT + +echo run >> $YSHELL + +# Break out non-essential groups so that yum succeeds even on rawhide +YSHELL2=${TMPDIR}/YUM-SHELL2_${DS}.txt +cat ->> $YSHELL2 <<EOT install @admin-tools install @base install @base-x @@ -124,15 +135,10 @@ install @fonts install @hardware-support install @input-methods install @printing -install fpaste install memtest86+ -install policycoreutils -install redhat-lsb -install rpmconf -distribution-synchronization EOT -echo run >> $YSHELL +echo run >> $YSHELL2 # echo "Removing dependency leaves and installing default package sets" @@ -140,6 +146,8 @@ echo "Removing dependency leaves and installing default package sets" semanage -o ${TMPDIR}/SELINUX-CUSTOM-CONFIG_${DS}.txt mv /etc/selinux/targeted ${TMPDIR}/targeted.${DS} yum shell $YSHELL -y --disableplugin=presto --skip-broken +yum shell $YSHELL2 -y --disableplugin=presto --skip-broken +yum -y distribution-synchronization --disableplugin=presto --skip-broken # Something went around above if this directory does not exist echo "Resetting local selinux policy" @@ -240,6 +248,7 @@ chmod 0700 ${TMPDIR}/raising-elephants.sh echo "Verify packages are installed the way you want and then type ${TMPDIR}/raising-elephants.sh" echo -n "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-VA,SELINUX-CUSTOM-CONFIG,URGENT-REVIEW,YUM-SHELL}_${DS}.txt echo "" |