summaryrefslogtreecommitdiffstats
path: root/distro-clean.sh
diff options
context:
space:
mode:
authorD. Johnson <fenris02@fedoraproject.org>2011-11-05 11:57:41 -0500
committerD. Johnson <fenris02@fedoraproject.org>2011-11-05 11:57:41 -0500
commite367aee00c580111ea9b4ec67c340c7dc4be0e3e (patch)
treec3e13a8f402cbbf5b1f7fdcfe55057eb41b23546 /distro-clean.sh
parentea521c450a2b8d239a7fb15dae150e5e4ee5f61e (diff)
downloadcleanup-e367aee00c580111ea9b4ec67c340c7dc4be0e3e.tar.gz
cleanup-e367aee00c580111ea9b4ec67c340c7dc4be0e3e.tar.xz
cleanup-e367aee00c580111ea9b4ec67c340c7dc4be0e3e.zip
speling tpyo
Diffstat (limited to 'distro-clean.sh')
-rwxr-xr-xdistro-clean.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/distro-clean.sh b/distro-clean.sh
index 5c79f9f..8f961fa 100755
--- a/distro-clean.sh
+++ b/distro-clean.sh
@@ -94,6 +94,7 @@ time rpm -a --setperms > /dev/null 2>&1
YSHELL=${TMPDIR}/YUM-SHELL_${DS}.txt
YSHELL2=${TMPDIR}/YUM-SHELL2_${DS}.txt
+# Reinstall desktops and sync
YSHELL3=${TMPDIR}/YUM-SHELL3_${DS}.txt
# Locate installed leaves packages that were installed as a dep of some other package
@@ -104,7 +105,7 @@ repoquery --installed --qf "%{nvra} - %{yumdb_info.reason}" \
echo remove $n
done > $YSHELL
-# reinstall duplicate packages, migtht clean them without breaking
+# reinstall duplicate packages, might clean them without breaking
package-cleanup -q --dupes > ${TMPDIR}/DUPLICATE-PACKAGES_${DS}.txt
[ -s ${TMPDIR}/DUPLICATE-PACKAGES_${DS}.txt ] && \
cat ${TMPDIR}/DUPLICATE-PACKAGES_${DS}.txt | \
@@ -145,10 +146,11 @@ yum grouplist -v \
echo "install @${GROUP}" >> $YSHELL3
done
-echo 'distribution-synchronization' >> $YSHELL3
-
+# Add default package sets
echo 'run' >> $YSHELL
+# Break out non-essential groups so that yum succeeds even on rawhide
echo 'run' >> $YSHELL2
+# Locate installed desktops -- Hack around broken depsolver
echo 'run' >> $YSHELL3
#
@@ -163,8 +165,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 update -y \*-release
+time yum update -y yum rpm
time yum shell $YSHELL2 -y --disableplugin=presto --skip-broken
-#time yum shell $YSHELL3 -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