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

Fixed not detecting top-level timezones like UTC; Fixed initramfs keymap 

not updated automatically when linked to normal keymap
This commit is contained in:
oddlama 2021-05-29 21:58:43 +02:00
parent 49cbc77c17
commit 4b02282309
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -61,11 +61,12 @@ function get_timezone() {
# /etc/localtime is a symlink as expected # /etc/localtime is a symlink as expected
local timezone local timezone
timezone=${file#*zoneinfo/} timezone=${file#*zoneinfo/}
if [[ $timezone = "$file" || ! $timezone =~ ^[^/]+/[^/]+$ ]]; then if [[ $timezone == "$file" ]]; then
# not pointing to expected location or not Region/City # not pointing to expected location or not Region/City
echo "Europe/London" echo "Europe/London"
else
echo "$timezone"
fi fi
echo "$timezone"
else else
# compare files by contents # compare files by contents
find /usr/share/zoneinfo -type f -exec cmp -s {} /etc/localtime \; -print \ find /usr/share/zoneinfo -type f -exec cmp -s {} /etc/localtime \; -print \
@ -1173,6 +1174,10 @@ function ADDITIONAL_PACKAGES_menu() {
# $1: filename # $1: filename
function save() { function save() {
if [[ "$KEYMAP_INITRAMFS_OTHER" == "false" ]]; then
KEYMAP_INITRAMFS="$KEYMAP"
fi
cat > "$1" <<EOF cat > "$1" <<EOF
# vim: set ft=sh ts=4 sw=4 sts=-1 noet: # vim: set ft=sh ts=4 sw=4 sts=-1 noet:
# This file will be interpreted by /bin/bash. # This file will be interpreted by /bin/bash.