From e1822abb7cf060668351a7e574fed1311815f18d Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Fri, 26 Oct 2018 18:35:51 +0200 Subject: [PATCH] [app-misc/calamares-sabayon-server-base-modules] Add configs for the modules we use Calamares now by default doesn't ship these configs anymore, we must provide them from this package. Also see Calamares 3.2.2release notes https://calamares.io/calamares-3.2.2-is-out --- .../files/modules-conf/modules/finished.conf | 21 ++++ .../files/modules-conf/modules/fstab.conf | 28 ++++++ .../files/modules-conf/modules/grubcfg.conf | 25 +++++ .../files/modules-conf/modules/locale.conf | 97 +++++++++++++++++++ .../files/modules-conf/modules/machineid.conf | 8 ++ .../files/modules-conf/modules/mount.conf | 36 +++++++ .../files/modules-conf/modules/partition.conf | 62 ++++++++++++ .../files/modules-conf/modules/umount.conf | 42 ++++++++ .../files/modules-conf/modules/welcome.conf | 30 ++++++ 9 files changed, 349 insertions(+) create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/finished.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/fstab.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/grubcfg.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/locale.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/machineid.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/mount.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/partition.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/umount.conf create mode 100644 app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/welcome.conf diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/finished.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/finished.conf new file mode 100644 index 000000000..29e5e49b4 --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/finished.conf @@ -0,0 +1,21 @@ +# Configuration for the "finished" page, which is usually shown only at +# the end of the installation (successful or not). +--- +# The finished page can hold a "restart system now" checkbox. +# If this is false, no checkbox is shown and the system is not restarted +# when Calamares exits. +restartNowEnabled: true + +# Initial state of the checkbox "restart now". Only relevant when the +# checkbox is shown by restartNowEnabled. +restartNowChecked: false + +# If the checkbox is shown, and the checkbox is checked, then when +# Calamares exits from the finished-page it will run this command. +# If not set, falls back to "shutdown -r now". +restartNowCommand: "systemctl -i reboot" + +# When the last page is (successfully) reached, send a DBus notification +# to the desktop that the installation is done. This works only if the +# user as whom Calamares is run, can reach the regular desktop session bus. +notifyOnFinished: false diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/fstab.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/fstab.conf new file mode 100644 index 000000000..11adff2ed --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/fstab.conf @@ -0,0 +1,28 @@ +# Creates /etc/fstab and /etc/crypttab in the target system. +# Also creates mount points for all the filesystems. +# +# When creating fstab entries for a filesystem, this module +# uses the options for the filesystem type to write to the +# options field of the file. +--- +# Mount options to use for all filesystems. If a specific filesystem +# is listed here, use those options, otherwise use the *default* +# options from this mapping. +mountOptions: + default: defaults,noatime + btrfs: defaults,noatime,space_cache,autodefrag + +# If a filesystem is on an SSD, add the following options. If a specific +# filesystem is listed here, use those options, otherwise no additional +# options are set (i.e. there is no *default* like in *mountOptions*). +ssdExtraMountOptions: + ext4: discard + jfs: discard + xfs: discard + swap: discard + btrfs: discard,compress=lzo + +# Additional options added to each line in /etc/crypttab +crypttabOptions: luks +# For Debian and Debian-based distributions, change the above line to: +# crypttabOptions: luks,keyscript=/bin/cat diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/grubcfg.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/grubcfg.conf new file mode 100644 index 000000000..b354ec35a --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/grubcfg.conf @@ -0,0 +1,25 @@ +# Write lines to /etc/default/grub (in the target system) based +# on calculated values and the values set in the *defaults* key +# in this configuration file. +# +# Calculated values are: +# - GRUB_DISTRIBUTOR, branding module, *bootloaderEntryName* +# - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems +# that use LUKS +# - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth +# support to the kernel. + +--- +# If set to true, always creates /etc/default/grub from scratch even if the file +# already existed. If set to false, edits the existing file instead. +overwrite: false + +# Default entries to write to /etc/default/grub if it does not exist yet or if +# we are overwriting it. +# +defaults: + GRUB_TIMEOUT: 5 + GRUB_DEFAULT: "saved" + GRUB_DISABLE_SUBMENU: true + GRUB_TERMINAL_OUTPUT: "console" + GRUB_DISABLE_RECOVERY: true diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/locale.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/locale.conf new file mode 100644 index 000000000..ddd0bc97e --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/locale.conf @@ -0,0 +1,97 @@ +--- +# This settings are used to set your default system time zone. +# Time zones are usually located under /usr/share/zoneinfo and +# provided by the 'tzdata' package of your Distribution. +# +# Distributions using systemd can list available +# time zones by using the timedatectl command. +# timedatectl list-timezones +# +# The starting timezone (e.g. the pin-on-the-map) when entering +# the locale page can be set through keys *region* and *zone*. +# If either is not set, defaults to America/New_York. +# +region: "America" +zone: "New_York" + + +# System locales are detected in the following order: +# +# - /usr/share/i18n/SUPPORTED +# - localeGenPath (defaults to /etc/locale.gen if not set) +# - 'locale -a' output +# +# Enable only when your Distribution is using an +# custom path for locale.gen +#localeGenPath: "PATH_TO/locale.gen" + +# GeoIP based Language settings: +# +# GeoIP need an working Internet connection. +# This can be managed from `welcome.conf` by adding +# internet to the list of required conditions. +# +# Leave commented out to disable GeoIP. +# +# An HTTP request is made to *geoipUrl* -- depending on the geoipStyle, +# the URL may be modified before use. The request should return +# valid data in a suitable format, depending on geoipStyle; +# generally this includes a string value with the timezone +# in / format. For services that return data which +# does not follow the conventions of "suitable data" described +# below, *geoIPSelector* may be used to pick different data. +# +# Note that this example URL works, but the service is shutting +# down in June 2018. +# +# Suitable JSON data looks like +# ``` +# {"time_zone":"America/New_York"} +# ``` +# Suitable XML data looks like +# ``` +# Europe/Brussels +# ``` +# +# To accomodate providers of GeoIP timezone data with peculiar timezone +# naming conventions, the following cleanups are performed automatically: +# - backslashes are removed +# - spaces are replaced with _ +# +#geoipUrl: "freegeoip.net" + +# GeoIP style. Leave commented out for the "legacy" interpretation. +# This setting only makes sense if geoipUrl is set, enabliing geoIP. +# +# Possible values are: +# unset same as "legacy" +# blank same as "legacy" +# "legacy" appends "/json" to geoipUrl, above, and uses JSON format +# (which is what freegeoip.net provides there). +# "json" URL is not modified, uses JSON format. +# "xml" URL is not modified, uses XML format. +# +# The JSON format is provided by freegeoip.net, but that service is +# shutting down in June 2018. There are other providers with the same +# format. XML format is provided for Ubiquity. +#geoipStyle: "legacy" + +# GeoIP selector. Leave commented out for the default selector +# (which depends on the style: JSON uses "time_zone" and XML +# uses TimeZone, for the FreeGeoIP-alike and the Ubiquity-alike +# respectively). If the service configured via *geoipUrl* uses +# a different attribute name (e.g. "timezone") in JSON or a +# different element tag (e.g. "") in XML, set this +# string to the name or tag to be used. +# +# In JSON: +# - if the string contains "." characters, this is used as a +# multi-level selector, e.g. "a.b" will select the timezone +# from data "{a: {b: "Europe/Amsterdam" } }". +# - each part of the string split by "." characters is used as +# a key into the JSON data. +# In XML: +# - all elements with the named tag (e.g. all TimeZone) elements +# from the document are checked; the first one with non-empty +# text value is used. +#geoipSelector: "" diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/machineid.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/machineid.conf new file mode 100644 index 000000000..263687263 --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/machineid.conf @@ -0,0 +1,8 @@ +--- +# Whether to create /etc/machine-id for systemd. +systemd: true +# Whether to create /var/lib/dbus/machine-id for D-Bus. +dbus: true +# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id +# (ignored if dbus is false, or if there is no /etc/machine-id to point to). +symlink: true diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/mount.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/mount.conf new file mode 100644 index 000000000..bb28eed66 --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/mount.conf @@ -0,0 +1,36 @@ +# Mount filesystems in the target (generally, before treating the +# target as a usable chroot / "live" system). Filesystems are +# automatically mounted from the partitioning module. Filesystems +# listed here are **extra**. The filesystems listed in *extraMounts* +# are mounted in all target systems. The filesystems listed in +# *extraMountsEfi* are mounted in the target system **only** if +# the host machine uses UEFI. +--- +# Extra filesystems to mount. The key's value is a list of entries; each +# entry has four keys: +# - device The device node to mount +# - fs The filesystem type to use +# - mountPoint Where to mount the filesystem +# - options (optional) Extra options to pass to mount(8) +# +extraMounts: + - device: proc + fs: proc + mountPoint: /proc + - device: sys + fs: sysfs + mountPoint: /sys + - device: /dev + mountPoint: /dev + options: bind + - device: tmpfs + fs: tmpfs + mountPoint: /run + - device: /run/udev + mountPoint: /run/udev + options: bind + +extraMountsEfi: + - device: efivarfs + fs: efivarfs + mountPoint: /sys/firmware/efi/efivars diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/partition.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/partition.conf new file mode 100644 index 000000000..78ad82f10 --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/partition.conf @@ -0,0 +1,62 @@ +# This setting specifies the mount point of the EFI system partition. Some +# distributions (Fedora, Debian, Manjaro, etc.) use /boot/efi, others (KaOS, +# etc.) use just /boot. +efiSystemPartition: "/boot/efi" + +# Make sure an autogenerated swap partition is big enough for hibernation in +# automated partitioning modes. Swap can be disabled through *neverCreateSwap*. +# +# When *ensureSuspendToDisk* is true, swap is never smaller than physical +# memory, follows the guideline 2 * memory until swap reaches 8GiB. +# When *ensureSuspendToDisk* is false, swap size scales up with memory +# size until 8GiB, then at roughly half of memory size. +# +# +# Default is true. +ensureSuspendToDisk: true + +# Never create swap partitions in automated partitioning modes. +# If this is true, ensureSuspendToDisk is ignored. +# Default is false. +neverCreateSwap: false + +# Correctly draw nested (e.g. logical) partitions as such. +drawNestedPartitions: false + +# Show/hide partition labels on manual partitioning page. +alwaysShowPartitionLabels: true + +# Default filesystem type, used when a "new" partition is made. +# +# When replacing a partition, the existing filesystem inside the +# partition is retained. In other cases, e.g. Erase and Alongside, +# as well as when using manual partitioning and creating a new +# partition, this filesystem type is pre-selected. Note that +# editing a partition in manual-creation mode will not automatically +# change the filesystem type to this default value -- it is not +# creating a new partition. +# +# Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs +# If nothing is specified, Calamares defaults to "ext4". +defaultFileSystemType: "ext4" + +# Show/hide LUKS related functionality in automated partitioning modes. +# Disable this if you choose not to deploy early unlocking support in GRUB2 +# and/or your distribution's initramfs solution. +# +# BIG FAT WARNING: +# +# This option is unsupported, as it cuts out a crucial security feature. +# Disabling LUKS and shipping Calamares without a correctly configured GRUB2 +# and initramfs is considered suboptimal use of the Calamares software. The +# Calamares team will not provide user support for any potential issue that +# may arise as a consequence of setting this option to false. +# It is strongly recommended that system integrators put in the work to support +# LUKS unlocking support in GRUB2 and initramfs/dracut/mkinitcpio/etc. +# Support is offered to system integrators that wish to do so, through the +# Calamares bug tracker, as well as in #calamares on Freenode. +# For more information on setting up GRUB2 for Calamares with LUKS, see +# https://github.com/calamares/calamares/wiki/Deploy-LUKS +# +# If nothing is specified, LUKS is enabled in automated modes. +#enableLuksAutomatedPartitioning: true diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/umount.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/umount.conf new file mode 100644 index 000000000..798dfc3f5 --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/umount.conf @@ -0,0 +1,42 @@ +### Umount Module +# +# This module represents the last part of the installation, the unmounting +# of partitions used for the install. It is also the last place where it +# is possible to copy files to the target system, thus the best place to +# copy an installation log. +# +# This module has two configuration keys: +# srcLog location in the live system where the log is +# destLog location in the target system to copy the log +# +# You can either use the default source path (which is +# `/root/.cache/Calamares/Calamares/Calamares.log` ) to copy the regular log, +# or if you want to use the full output of `sudo calamares -d` you will need +# to redirect standard output, for instance in a launcher script or +# in the desktop file. +# +# Example launcher script: +# +# ``` +# #!/bin/sh +# sudo /usr/bin/calamares -d > installation.log +# ``` +# +# Example desktop line: +# +# ``` +# Exec=sudo /usr/bin/calamares -d > installation.log +# ``` +# +# If no source and destination are set, no copy is attempted. If the +# copy fails for some reason, a warning is printed but the installation +# does not fail. + +--- +# example when using the normal Calamares log: +srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" +destLog: "/var/log/Calamares.log" + +# example when using a log created by `sudo calamares -d`: +#srcLog: "/home/live/installation.log" +#destLog: "/var/log/installation.log" diff --git a/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/welcome.conf b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/welcome.conf new file mode 100644 index 000000000..b7ce5cfcd --- /dev/null +++ b/app-misc/calamares-sabayon-server-base-modules/files/modules-conf/modules/welcome.conf @@ -0,0 +1,30 @@ +--- +showSupportUrl: true +showKnownIssuesUrl: true +showReleaseNotesUrl: true + +requirements: + requiredStorage: 5.5 + requiredRam: 1.0 + internetCheckUrl: http://google.com + + # List conditions to check. Each listed condition will be + # probed in some way, and yields true or false according to + # the host system satisfying the condition. + # + # This sample file lists all the conditions that are know. + check: + - storage + - ram + - power + - internet + - root + - screen + # List conditions that must be satisfied (from the list + # of conditions, above) for installation to proceed. + # If any of these conditions are not met, the user cannot + # continue past the welcome page. + required: + # - storage + - ram + # - root