diff options
Diffstat (limited to 'configs/profile/root-image/root')
4 files changed, 23 insertions, 12 deletions
diff --git a/configs/profile/root-image/root/.install-openrc-lxde/packages b/configs/profile/root-image/root/.install-openrc-lxde/packages index 6838e54..b29de69 100644 --- a/configs/profile/root-image/root/.install-openrc-lxde/packages +++ b/configs/profile/root-image/root/.install-openrc-lxde/packages @@ -1,8 +1,11 @@ -base-openrc +base +systemd-libs-dummy +opensysusers +parabola-base gpm-openrc haveged-openrc hdparm-openrc -networkmanager-openrc +networkmanager ntp-openrc openssh-openrc openvpn-openrc @@ -46,9 +49,13 @@ xf86-video-sisusb xorg-xinit gvfs-mtp gvfs-gphoto2 -networkmanager-elogind -openrc-desktop -polkit-elogind +acpid-openrc +alsa-utils-openrc +avahi-openrc +bluez-openrc +displaymanager-openrc +modemmanager-pk-rules +elogind epdfview galculator gksu diff --git a/configs/profile/root-image/root/.install-systemd-mate/packages b/configs/profile/root-image/root/.install-systemd-mate/packages index 4262345..a07c6c0 100644 --- a/configs/profile/root-image/root/.install-systemd-mate/packages +++ b/configs/profile/root-image/root/.install-systemd-mate/packages @@ -1,4 +1,5 @@ base +parabola-base gpm haveged hdparm diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc index d24b3ed..9831e0f 100644 --- a/configs/profile/root-image/root/customize_root_image-constants.inc +++ b/configs/profile/root-image/root/customize_root_image-constants.inc @@ -3,10 +3,10 @@ # ISO_INIT # ISO_GUI # ENABLE_OFFLINE_INSTALL -# HAS_BRLTTY_TTS +# ENABLE_TTS_BRLTTY -/* timezone and locales */ +## timezone and locales ## readonly LOCALES="en_US\.UTF-8 \ eo \ @@ -18,12 +18,12 @@ readonly LOCALES="en_US\.UTF-8 \ pl_PL\.UTF-8 " -/* pacman */ +## pacman ## readonly NONSYSTEMD_REGEX='N ; s|^#\[nonsystemd\].*#Include|\[nonsystemd\]\nInclude|' -/* services */ +## services ## readonly OPENRC_DELETE_FILES="/etc/hostname \ /etc/systemd/scripts/choose-mirror \ @@ -37,11 +37,11 @@ readonly SYSTEMD_DELETE_FILES="/etc/conf.d/agetty.tty1 \ /etc/X11/Xwrapper.config" readonly OPENRC_SERVICES_ALL="dbus \ + elogind \ haveged \ NetworkManager \ pacman-init " -readonly OPENRC_SERVICES_GUI="alsasound \ - elogind " +readonly OPENRC_SERVICES_GUI="alsasound" readonly SYSTEMD_SERVICES_ALL="choose-mirror.service \ multi-user.target \ pacman-init.service " @@ -56,7 +56,7 @@ readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL} $([[ "${ENABLE_TTS_BRLTTY}" == 'yes' ]] && echo " ${SYSTEMD_SERVICES_ACC}")" -/* system defaults and root user */ +## system defaults and root user ## readonly DEFAULT_SHELL=/bin/bash diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh index 5496535..32bca8b 100755 --- a/configs/profile/root-image/root/customize_root_image.sh +++ b/configs/profile/root-image/root/customize_root_image.sh @@ -24,6 +24,9 @@ LOG_CONFIG "pacman" [[ "${ISO_INIT}" == 'openrc' ]] && sed -i "$NONSYSTEMD_REGEX" /etc/pacman-online.conf [[ "${INSTALL_TYPE}" == 'Complete' ]] && cp /etc/pacman-offline.conf /etc/pacman.conf || \ cp /etc/pacman-online.conf /etc/pacman.conf +# FIXME: https://labs.parabola.nu/issues/2576 +# this LOC can be removed eventually after the new 'base' meta-package is stabilized +pacman -R $(pacman -Qq | grep ^systemd-) netctl LOG_CONFIG "services" |