mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
use _PACKAGES from /etc/archboot/defaults as standard package install source
This commit is contained in:
parent
eb95b0d38c
commit
6ea03ba362
4 changed files with 15 additions and 9 deletions
|
@ -1,6 +1,6 @@
|
||||||
# defaults for archboot
|
# defaults for archboot
|
||||||
# additional packages to install eg. firmware
|
# packages to install eg. firmware
|
||||||
_PACKAGES="linux-firmware"
|
_PACKAGES="base linux linux-firmware"
|
||||||
# grub config to use
|
# grub config to use
|
||||||
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
|
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
|
||||||
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
|
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
|
||||||
|
|
|
@ -63,7 +63,10 @@ chroot_umount()
|
||||||
|
|
||||||
# package_installation
|
# package_installation
|
||||||
install_packages() {
|
install_packages() {
|
||||||
PACKAGES="base linux linux-firmware"
|
# add packages from archboot defaults
|
||||||
|
PACKAGES=$(grep '^_PACKAGES' /etc/archboot/defaults | sed -e 's#_PACKAGES=##g' -e 's#"##g')
|
||||||
|
# fallback if _PACKAGES is empty
|
||||||
|
[[ -z "${PACKAGES}" ]] && PACKAGES="base linux linux-firmware"
|
||||||
# Add packages which are not in core repository
|
# Add packages which are not in core repository
|
||||||
if lsblk -rnpo FSTYPE | grep -q btrfs; then
|
if lsblk -rnpo FSTYPE | grep -q btrfs; then
|
||||||
! echo "${PACKAGES}" | grep -qw btrfs-progs && PACKAGES="${PACKAGES} btrfs-progs"
|
! echo "${PACKAGES}" | grep -qw btrfs-progs && PACKAGES="${PACKAGES} btrfs-progs"
|
||||||
|
|
|
@ -2599,8 +2599,11 @@ install_packages() {
|
||||||
fi
|
fi
|
||||||
prepare_pacman
|
prepare_pacman
|
||||||
PACKAGES=""
|
PACKAGES=""
|
||||||
DIALOG --yesno "Next step will install base, linux, linux-firmware, netctl and filesystem tools for a minimal system.\n\nDo you wish to continue?" 10 50 || return 1
|
# add packages from archboot defaults
|
||||||
PACKAGES="base linux linux-firmware"
|
PACKAGES=$(grep '^_PACKAGES' /etc/archboot/defaults | sed -e 's#_PACKAGES=##g' -e 's#"##g')
|
||||||
|
# fallback if _PACKAGES is empty
|
||||||
|
[[ -z "${PACKAGES}" ]] && PACKAGES="base linux linux-firmware"
|
||||||
|
DIALOG --yesno "Next step will install ${PACKAGES}, netctl and filesystem tools for a minimal system.\n\nDo you wish to continue?" 10 50 || return 1
|
||||||
# Add packages which are not in core repository
|
# Add packages which are not in core repository
|
||||||
if [[ -n "$(pgrep dhclient)" ]]; then
|
if [[ -n "$(pgrep dhclient)" ]]; then
|
||||||
! echo "${PACKAGES}" | grep -qw dhclient && PACKAGES="${PACKAGES} dhclient"
|
! echo "${PACKAGES}" | grep -qw dhclient && PACKAGES="${PACKAGES} dhclient"
|
||||||
|
|
|
@ -125,8 +125,8 @@ _umount_special() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_install_base_packages() {
|
_install_base_packages() {
|
||||||
echo "Installing packages base linux and ${_PACKAGES} to ${1} ..."
|
echo "Installing packages ${_PACKAGES} to ${1} ..."
|
||||||
pacman --root "${1}" -Sy base linux "${_PACKAGES}" --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
|
pacman --root "${1}" -Sy "${_PACKAGES}" --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
_install_archboot() {
|
_install_archboot() {
|
||||||
|
@ -135,11 +135,11 @@ _install_archboot() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_aarch64_install_base_packages() {
|
_aarch64_install_base_packages() {
|
||||||
echo "Installing packages base linux and ${_PACKAGES} to ${1} ..."
|
echo "Installing packages ${_PACKAGES} to ${1} ..."
|
||||||
if [[ -e "$(basename "${_PACMAN_CONF}")" ]]; then
|
if [[ -e "$(basename "${_PACMAN_CONF}")" ]]; then
|
||||||
_PACMAN_CONF=$(basename "${_PACMAN_CONF}")
|
_PACMAN_CONF=$(basename "${_PACMAN_CONF}")
|
||||||
fi
|
fi
|
||||||
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Sy base linux ${_PACKAGES} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
|
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Sy ${_PACKAGES} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
_aarch64_install_archboot() {
|
_aarch64_install_archboot() {
|
||||||
|
|
Loading…
Reference in a new issue