|
|
|
|
@ -13,17 +13,17 @@ SYSCONF="${ROOTFS}${SYSCONF}"
|
|
|
|
|
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
|
|
|
|
|
|
|
|
|
|
exec_install_pkg_tar(){
|
|
|
|
|
[[ -n $(find /memory/layer-base/*/install/preinit -type f -name "*.pkg.tar.*" -print 2>/dev/null) ]] || return 0
|
|
|
|
|
if [[ -n ${ROOTFS} ]]; then
|
|
|
|
|
LIST_PKG=$(find /memory/layer-base/*/install/preinit -type f -name "*.pkg.tar.*" -print 2>/dev/null)
|
|
|
|
|
if [[ -n ${ROOTFS} && -n ${LIST_PKG} ]]; then
|
|
|
|
|
mount -t proc /proc /${ROOTFS}/proc
|
|
|
|
|
mount -t sysfs /sys /${ROOTFS}/sys
|
|
|
|
|
mount --bind /dev/ /${ROOTFS}/dev
|
|
|
|
|
LC_ALL=C LD_LIBRARY_PATH="${ROOTFS}/usr/lib" find /memory/layer-base/*/install/preinit -type f -name "*.pkg.tar.*" -exec ${ROOTFS}/usr/bin/pacman --quiet --sysroot ${ROOTFS} -U --noprogressbar --noconfirm {} +
|
|
|
|
|
LC_ALL=C LD_LIBRARY_PATH="${ROOTFS}/usr/lib" ${ROOTFS}/usr/bin/pacman --sysroot ${ROOTFS} -U --noprogressbar --noconfirm ${LIST_PKG}
|
|
|
|
|
umount /${ROOTFS}/dev
|
|
|
|
|
umount /${ROOTFS}/sys
|
|
|
|
|
umount /${ROOTFS}/proc
|
|
|
|
|
else
|
|
|
|
|
find /memory/layer-base/*/install/preinit -type f -name "*.pkg.tar.*" -exec pacman --quiet -U --noprogressbar --noconfirm {} +
|
|
|
|
|
elif [[ -n ${LIST_PKG} ]]; then
|
|
|
|
|
pacman -U --noprogressbar --noconfirm ${LIST_PKG}
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|