From e9f7f6603cc9c1f3a5363a9e866e01bc10aaa9a0 Mon Sep 17 00:00:00 2001 From: thiblizz <101073848+thiblizz@users.noreply.github.com> Date: Fri, 13 Oct 2023 02:47:14 +0200 Subject: [PATCH] Revert to initial logic --- scripts/main.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/main.sh b/scripts/main.sh index 56ce505..0c98b4e 100644 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -13,13 +13,18 @@ function install_stage3() { } function configure_base_system() { - if [[ $SYSTEMD == "true" ]]; then + if [[ $MUSL == "true" ]]; then + einfo "Installing musl-locales" + try emerge --verbose sys-apps/musl-locales + else einfo "Generating locales" echo "$LOCALES" > /etc/locale.gen \ || die "Could not write /etc/locale.gen" locale-gen \ || die "Could not generate locales" + fi + if [[ $SYSTEMD == "true" ]]; then einfo "Setting machine-id" systemd-machine-id-setup \ || die "Could not setup systemd machine id" @@ -43,11 +48,6 @@ function configure_base_system() { ln -sfn "../usr/share/zoneinfo/$TIMEZONE" /etc/localtime \ || die "Could not change /etc/localtime link" else - if [[ $MUSL == "true" ]]; then - einfo "Installing musl-locales" - try emerge --verbose sys-apps/musl-locales - fi - # Set hostname einfo "Selecting hostname" sed -i "/hostname=/c\\hostname=\"$HOSTNAME\"" /etc/conf.d/hostname \