diff --git a/lib/initcpio/install/arch_core_install b/lib/initcpio/install/arch_core_install index 0aba1240b..74e73f71d 100644 --- a/lib/initcpio/install/arch_core_install +++ b/lib/initcpio/install/arch_core_install @@ -73,7 +73,7 @@ install () if [ "$(echo ${arch} | grep 'any')" ]; then cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-any.pkg.tar.gz ${TEMPDIR}/core-any/pkg/ echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}-any.pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt - repo-add ${TEMPDIR}/core-any/pkg/core.db.tar.gz /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-any.pkg.tar.gz || return 1 + repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-any.pkg.tar.gz || return 1 else cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz ${TEMPDIR}/core-$(uname -m)/pkg/ echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt diff --git a/usr/bin/archboot-allinone.sh b/usr/bin/archboot-allinone.sh index f3cafd332..c28bfa1e4 100755 --- a/usr/bin/archboot-allinone.sh +++ b/usr/bin/archboot-allinone.sh @@ -83,6 +83,7 @@ tar xvf core-x86_64.tar -C ${CORE64} || exit 1 # move in packages mv ${LOWMEM}/tmp/*/core-i686 ${ALLINONE}/ mv ${LOWMEM64}/tmp/*/core-x86_64 ${ALLINONE}/ +mv ${LOWMEM}/tmp/*/core-any ${ALLINONE}/ # move in doc mv ${CORE}/tmp/*/arch/archdoc.txt ${ALLINONE}/arch/