makedist.sh: fix removal of unused locales (fixes espanol release); some obsolete comments cleanup

This commit is contained in:
Silvan Calarco 2011-11-02 14:24:07 +01:00
parent 65ed94aa27
commit c5ad73f81d

View File

@ -111,28 +111,17 @@ ONBOOT=yes
_EOF _EOF
fi fi
# erase_rpm_database #erase_rpm_database
clean_rpm_database clean_rpm_database
echo "Deleting unneeded files..."
# delete unused localizations # delete unused localizations
# #
find $MOUNTDIR/usr/share/locale \ echo "Deleting other languages l10n files..."
-maxdepth 1 -mindepth 1 -type d \ for d in /usr/share/locale /opt/kde/share/locale \
! -name it* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \; /opt/kde/share/locale/l10n /opt/kde3/share/locale; do
find ${MOUNTDIR}${d} -maxdepth 1 -mindepth 1 -type d \
#$CHROOTCMD chkconfig --add acpid || ! -name ${LANGUAGE}* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \; 2>/dev/null
# { echo "$mkcd_me: fatal error, aborting installation" >&2 done
# { (exit 1); exit 1; }; }
# configure extlinux boot loader
#cat > $MOUNTDIR/boot/extlinux.conf << _EOF
#DEFAULT $PLATFORM
#LABEL $PLATFORM
#KERNEL /boot/vmlinuz-${KERNEL_VER}${KERNEL_EXTRAVER}
#APPEND video=vesafb:1280x1024-32 root=$ROOTDEV console=tty1
#resume2=swap:$SWAPDEV
#_EOF
if [ "$U_BOOT" ]; then if [ "$U_BOOT" ]; then
echo "Copying u-boot Image for Kernel" echo "Copying u-boot Image for Kernel"
@ -148,10 +137,6 @@ if [ ${MULTITHREAD:-0} -gt 0 ]; then
sed -i "s|multithread=1|multithread=0|" $MOUNTDIR/etc/sysconfig/rc sed -i "s|multithread=1|multithread=0|" $MOUNTDIR/etc/sysconfig/rc
fi fi
# blacklist buggy ehci_hcd
#echo "blacklist ehci_hcd" > $MOUNTDIR/etc/modprobe.conf.d/ehci_hcd
# set rootdev on extlinux # set rootdev on extlinux
[ -e $MOUNTDIR/boot/extlinux.conf ] && sed -i "s|\([^::alpha]root=\)[^ ]*|\1$ROOTDEV|" $MOUNTDIR/boot/extlinux.conf [ -e $MOUNTDIR/boot/extlinux.conf ] && sed -i "s|\([^::alpha]root=\)[^ ]*|\1$ROOTDEV|" $MOUNTDIR/boot/extlinux.conf