From 30a035c2d73237b4c6a8d74d4f63766af90e620d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 25 Jan 2021 01:12:32 +0100 Subject: [PATCH] Misc fixes following tests --- README.md | 4 +++- menu.cfg | 4 ++-- profiles/default.preseed | 23 +++++++++++++++++------ profiles/expert.preseed | 25 ++++++++++++++++++------- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 429fac5..f76c213 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,9 @@ Or Install process configuration ----------------------------- -- menu.cfg doc: https://wiki.syslinux.org/wiki/index.php?title=Menu +- menu.cfg doc: + - https://wiki.syslinux.org/wiki/index.php?title=Menu + - https://wiki.archlinux.org/index.php/syslinux#Configuration - Preseed configuration doc: https://www.debian.org/releases/stable/s390x/apb.en.html diff --git a/menu.cfg b/menu.cfg index 8209ba1..3c07a14 100644 --- a/menu.cfg +++ b/menu.cfg @@ -1,7 +1,7 @@ menu hshift 15 -menu width 49 +menu width 75 -menu title Installer boot menu +menu title YunoHost installation menu background splash.png menu color title * #FFFFFFFF * diff --git a/profiles/default.preseed b/profiles/default.preseed index 5c447b8..9c57cb3 100644 --- a/profiles/default.preseed +++ b/profiles/default.preseed @@ -12,17 +12,28 @@ d-i mirror/http/hostname string ftp.debian.org d-i mirror/http/directory string /debian d-i mirror/http/proxy string -### Clock and time zone setup -d-i clock-setup/utc boolean true -d-i clock-setup/ntp boolean true -d-i clock-setup/ntp-server string 0.fr.pool.ntp.org +### Localization -# Set locale to en_UK but seen to false, such that the question is asked anyway -d-i debian-installer/locale string en_UK +# Set default answers to question, but set them as "false" so that they're asked anyway +# This prevent for example the default country to be "United States" and having to search +# for Europe -> Paris in "Other" ... +d-i debian-installer/language string en +d-i debian-installer/language seen false + +d-i debian-installer/country string GB +d-i debian-installer/country seen false + +d-i debian-installer/locale string en_GB.UTF-8 d-i debian-installer/locale seen false d-i time/zone string Europe/Paris d-i time/zone seen false +d-i clock-setup/utc boolean true +d-i clock-setup/ntp boolean true +d-i clock-setup/ntp-server string 0.fr.pool.ntp.org + +d-i keyboard-configuration/xkb-keymap select us +d-i keyboard-configuration/xkb-keymap seen false ### Partitioning d-i partman-auto/method string lvm diff --git a/profiles/expert.preseed b/profiles/expert.preseed index 50723fd..2f38840 100644 --- a/profiles/expert.preseed +++ b/profiles/expert.preseed @@ -13,17 +13,28 @@ d-i mirror/http/directory string /debian d-i mirror/http/proxy string d-i mirror/http/proxy seen false -### Clock and time zone setup +### Localization + +# Set default answers to question, but set them as "false" so that they're asked anyway +# This prevent for example the default country to be "United States" and having to search +# for Europe -> Paris in "Other" ... +d-i debian-installer/language string en +d-i debian-installer/language seen false + +d-i debian-installer/country string GB +d-i debian-installer/country seen false + +d-i debian-installer/locale string en_GB.UTF-8 +d-i debian-installer/locale seen false + +d-i time/zone string Europe/Paris +d-i time/zone seen false d-i clock-setup/utc boolean true d-i clock-setup/ntp boolean true d-i clock-setup/ntp-server string 0.fr.pool.ntp.org -# Set locale to en_UK but seen to false, such that the question is asked anyway -#d-i debian-installer/locale string en_UK -#d-i debian-installer/locale seen false - -#d-i time/zone string Europe/Paris -#d-i time/zone seen false +d-i keyboard-configuration/xkb-keymap select us +d-i keyboard-configuration/xkb-keymap seen false ### Partitioning d-i partman-auto/method string lvm