diff --git a/c5-i386-comps.xml b/c5-i386-comps.xml index ea73f69..a6183c6 100644 --- a/c5-i386-comps.xml +++ b/c5-i386-comps.xml @@ -808,7 +808,6 @@ <packagereq type="default">rdist</packagereq> <packagereq type="default">readahead</packagereq> <packagereq type="default">redhat-lsb</packagereq> - <packagereq type="default">redhat-support-tool</packagereq> <packagereq type="default">rhn-check</packagereq> <packagereq type="default">rhn-setup</packagereq> <packagereq type="default">rng-utils</packagereq> diff --git a/c5-x86_64-comps.xml b/c5-x86_64-comps.xml index 2a795f1..1c94981 100644 --- a/c5-x86_64-comps.xml +++ b/c5-x86_64-comps.xml @@ -808,7 +808,6 @@ <packagereq type="default">rdist</packagereq> <packagereq type="default">readahead</packagereq> <packagereq type="default">redhat-lsb</packagereq> - <packagereq type="default">redhat-support-tool</packagereq> <packagereq type="default">rhn-check</packagereq> <packagereq type="default">rhn-setup</packagereq> <packagereq type="default">rng-utils</packagereq> diff --git a/tools/compsgen.sh b/tools/compsgen.sh index aaabcfd..22845b9 100755 --- a/tools/compsgen.sh +++ b/tools/compsgen.sh @@ -256,15 +256,15 @@ echo "</comps>" >> $outputxml if [ "$release" = "6" ];then sed -i s/"Red Hat Enterprise Linux"/"CentOS Linux"/g $outputxml sed -i s/"redhat-indexhtml"/"centos-indexhtml"/g $outputxml - sed -i '/Red_Hat_Enterprise_Linux-Release_Notes/d' $outputxml - sed -i '/subscription-manager-gnome/d' $outputxml - sed -i '/subscription-manager/d' $outputxml - sed -i '/subscription-manager-firstboot/d' $outputxml + sed -i '/Red_Hat_Enterprise_Linux-Release_Notes/d' $outputxml + sed -i '/subscription-manager-gnome/d' $outputxml + sed -i '/subscription-manager/d' $outputxml + sed -i '/subscription-manager-firstboot/d' $outputxml elif [ "$release" = "5" ];then sed -i '/redhat-release-notes/d' $outputxml sed -i s/"Red Hat"/"CentOS"/g $outputxml sed -i s/"redhat-release"/"centos-release"/g $outputxml - + sed -i '/redhat-support-tool/d' $outputxml fi }