makedist.inc.sh: minor fixes

This commit is contained in:
Silvan Calarco 2019-10-16 15:21:29 +02:00
parent 4a810fb206
commit cdc83e7ef3

View File

@ -13,8 +13,8 @@ create_rpm_database
create_devices create_devices
echo "Installing preparation packages..." echo "Installing preparation packages..."
install_rpms "filesystem shadow gzip texinfo ldconfig bash libreadline glibc libncurses setup coreutils chkconfig \ install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses setup coreutils chkconfig \
libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam" "--nodeps --noorder --noscripts" libacl libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam" "--nodeps --noorder --noscripts"
# pam initscripts # pam initscripts
chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20 chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20
@ -125,6 +125,7 @@ fi
if [ "$APPLICATION_TARGET" ]; then if [ "$APPLICATION_TARGET" ]; then
add_additional_defs_file /usr/share/openmamba/pkggroups.db add_additional_defs_file /usr/share/openmamba/pkggroups.db
for t in $APPLICATION_TARGET; do for t in $APPLICATION_TARGET; do
clean_rpm_database
install_rpms_by_target "Installing $t application packages." "$t" "${RPMEXTRAARGS}" install_rpms_by_target "Installing $t application packages." "$t" "${RPMEXTRAARGS}"
done done
fi fi