manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to initial logic

This commit is contained in:
thiblizz 2023-10-13 02:47:14 +02:00 committed by GitHub
parent 5d27a4c1c9
commit e9f7f6603c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/main.sh
View File

@ -13,13 +13,18 @@ function install_stage3() {
} }
function configure_base_system() { 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" einfo "Generating locales"
echo "$LOCALES" > /etc/locale.gen \ echo "$LOCALES" > /etc/locale.gen \
|| die "Could not write /etc/locale.gen" || die "Could not write /etc/locale.gen"
locale-gen \ locale-gen \
|| die "Could not generate locales" || die "Could not generate locales"
fi
if [[ $SYSTEMD == "true" ]]; then
einfo "Setting machine-id" einfo "Setting machine-id"
systemd-machine-id-setup \ systemd-machine-id-setup \
|| die "Could not setup systemd machine id" || die "Could not setup systemd machine id"
@ -43,11 +48,6 @@ function configure_base_system() {
ln -sfn "../usr/share/zoneinfo/$TIMEZONE" /etc/localtime \ ln -sfn "../usr/share/zoneinfo/$TIMEZONE" /etc/localtime \
|| die "Could not change /etc/localtime link" || die "Could not change /etc/localtime link"
else else
if [[ $MUSL == "true" ]]; then
einfo "Installing musl-locales"
try emerge --verbose sys-apps/musl-locales
fi
# Set hostname # Set hostname
einfo "Selecting hostname" einfo "Selecting hostname"
sed -i "/hostname=/c\\hostname=\"$HOSTNAME\"" /etc/conf.d/hostname \ sed -i "/hostname=/c\\hostname=\"$HOSTNAME\"" /etc/conf.d/hostname \