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

Merge pull request #102 from thiblizz/patch-7 

feat: support musl timezone
This commit is contained in:
oddlama 2023-11-06 11:52:16 +01:00 committed by GitHub
parent f5ba6e5147 de8c16211b
commit 1815d710ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/main.sh
View File

@ -54,12 +54,19 @@ function configure_base_system() {
|| die "Could not sed replace in /etc/conf.d/hostname" || die "Could not sed replace in /etc/conf.d/hostname"
# Set timezone # Set timezone
if [[ $MUSL == "true" ]]; then
try emerge -v sys-libs/timezone-data
einfo "Selecting timezone"
echo -e "\nTZ=\"$TIMEZONE\"" >> /etc/env.d/00musl \
|| die "Could not write to /etc/env.d/00musl"
else
einfo "Selecting timezone" einfo "Selecting timezone"
echo "$TIMEZONE" > /etc/timezone \ echo "$TIMEZONE" > /etc/timezone \
|| die "Could not write /etc/timezone" || die "Could not write /etc/timezone"
chmod 644 /etc/timezone \ chmod 644 /etc/timezone \
|| die "Could not set correct permissions for /etc/timezone" || die "Could not set correct permissions for /etc/timezone"
try emerge -v --config sys-libs/timezone-data try emerge -v --config sys-libs/timezone-data
fi
# Set keymap # Set keymap
einfo "Selecting keymap" einfo "Selecting keymap"
@ -390,7 +397,7 @@ EOF
# Install authorized_keys before dracut, which might need them for remote unlocking. # Install authorized_keys before dracut, which might need them for remote unlocking.
install_authorized_keys install_authorized_keys
# Install required programs and kernel now, in oder to # Install required programs and kernel now, in order to
# prevent emerging module before an imminent kernel upgrade # prevent emerging module before an imminent kernel upgrade
try emerge --verbose sys-kernel/dracut sys-kernel/gentoo-kernel-bin app-arch/zstd try emerge --verbose sys-kernel/dracut sys-kernel/gentoo-kernel-bin app-arch/zstd