--- builds_bin/build_installer 2008/09/13 01:26:40 1.16 +++ builds_bin/build_installer 2010/04/08 20:03:57 1.20 @@ -14,6 +14,8 @@ then exit 1 fi +rm -rf $(pwd)/$distarch/{images,isolinux} $(pwd)/$distarch/SME/base/{hdlist*,*.img} + if [ "$distrel" == "7" ] then PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/genhdlist \ @@ -37,7 +39,7 @@ then PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \ --product "$distname" \ - --version "$distrel.0" \ + --version "${distvers/[^0-9.]*/}" \ --release "$distname" \ --prodpath SME \ --pkgorder pkgorder.$distarch \ @@ -54,19 +56,20 @@ else fi done - sed '/^cat .*pluginconf.d\/fedorakmod.conf.*<<.*EOF/,/^EOF$/s@^enabled.*@enabled = 0@' \ + sed "/installforallkernels/ised -i 's|\\\\(enabled\\\\) = 1|\\\\1 = 0|' \$DEST/etc/yum/pluginconf.d/kmod.conf" \ /usr/lib/anaconda-runtime/upd-instroot > upd-instroot chmod 755 upd-instroot sudo chown root:root upd-instroot PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \ --product "$distname" \ - --version "$distrel.0" \ + --version "${distvers/[^0-9.]*/}" \ --release "$distname" \ --prodpath SME \ --bugurl http://bugs.contribs.org/ \ $(pwd)/$distarch/ + rm -rf $distarch/buildinstall.tree.*/ sudo rm upd-instroot fi