mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
don't remove firmware on full system, don't install FIX_PACKAGES on full system
This commit is contained in:
parent
9b9d2d47e6
commit
40f6563d45
1 changed files with 7 additions and 5 deletions
|
@ -332,10 +332,12 @@ _cleanup_cache() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_prepare_graphic() {
|
_prepare_graphic() {
|
||||||
echo "Removing firmware files ..."
|
if [[ ! -e "/.full-system" ]]; then
|
||||||
rm -rf /usr/lib/firmware
|
echo "Removing firmware files ..."
|
||||||
# fix libs first, then install packages from defaults
|
rm -rf /usr/lib/firmware
|
||||||
_GRAPHIC="${_FIX_PACKAGES} ${1}"
|
# fix libs first, then install packages from defaults
|
||||||
|
_GRAPHIC="${_FIX_PACKAGES} ${1}"
|
||||||
|
fi
|
||||||
# saving RAM by calling always cleanup hook and installing each package alone
|
# saving RAM by calling always cleanup hook and installing each package alone
|
||||||
if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
|
if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
|
||||||
echo "Running pacman to install packages: ${_GRAPHIC} ..."
|
echo "Running pacman to install packages: ${_GRAPHIC} ..."
|
||||||
|
@ -348,7 +350,7 @@ _prepare_graphic() {
|
||||||
for i in ${_GRAPHIC}; do
|
for i in ${_GRAPHIC}; do
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1
|
pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1
|
||||||
[[ ! -e "/.full-system" ]] &&_cleanup_install
|
[[ ! -e "/.full-system" ]] && _cleanup_install
|
||||||
[[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache
|
[[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache
|
||||||
rm -f /var/log/pacman.log
|
rm -f /var/log/pacman.log
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue