Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=5c6cf61f1e8524d585f4535f541087215e78d0fd
commit 5c6cf61f1e8524d585f4535f541087215e78d0fd Author: crazy <[email protected]> Date: Sun Oct 22 05:16:22 2017 +0200 calamares-config-global: cleaup diff --git a/calamares/calamares-config-global/modules/bootloader.conf b/calamares/calamares-config-global/modules/bootloader.conf index a5c0638..fe08548 100644 --- a/calamares/calamares-config-global/modules/bootloader.conf +++ b/calamares/calamares-config-global/modules/bootloader.conf @@ -3,18 +3,6 @@ # Possible options are 'grub' and 'systemd-boot'. efiBootLoader: "grub" -# systemd-boot configuration files settings, set kernel and initramfs file names -# and amount of time before default selection boots -#kernel: "/vmlinuz-linux" -#img: "/initramfs-linux.img" -#fallback: "/initramfs-linux-fallback.img" -#timeout: "10" -# Optionally set the menu entry name and kernel name to use in systemd-boot. -# If not specified here, these settings will be taken from branding.desc. -# bootloaderEntryName: "Generic GNU/Linux" -# kernelLine: ", with Stable-Kernel" -# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)" - # GRUB 2 binary names and boot directory # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. grubInstall: "grub-install" diff --git a/calamares/calamares-config-global/modules/displaymanager.conf b/calamares/calamares-config-global/modules/displaymanager.conf index 2d3205a..baa574b 100644 --- a/calamares/calamares-config-global/modules/displaymanager.conf +++ b/calamares/calamares-config-global/modules/displaymanager.conf @@ -1,9 +1,10 @@ --- -#The DM module attempts to set up all the DMs found in this list, in that precise order. -#It also sets up autologin, if the feature is enabled in globalstorage. -#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. +# The DM module attempts to set up all the DMs found in this list, in that precise order. +# It also sets up autologin, if the feature is enabled in globalstorage. +# The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. displaymanagers: - sddm + - gdm #Enable the following settings to force a desktop environment in your displaymanager configuration file: #defaultDesktopEnvironment: diff --git a/calamares/calamares-config-global/modules/locale.conf b/calamares/calamares-config-global/modules/locale.conf index 0db83dc..c9e085c 100644 --- a/calamares/calamares-config-global/modules/locale.conf +++ b/calamares/calamares-config-global/modules/locale.conf @@ -2,6 +2,7 @@ region: "Europe" zone: "Berlin" -# GeoIP settings. Leave commented out to disable GeoIP. #localeGenPath: "/etc/locale.gen" + +# GeoIP settings. Leave commented out to disable GeoIP. #geoipUrl: "freegeoip.net" diff --git a/calamares/calamares-config-global/modules/partition.conf b/calamares/calamares-config-global/modules/partition.conf index 161d886..0df00ca 100644 --- a/calamares/calamares-config-global/modules/partition.conf +++ b/calamares/calamares-config-global/modules/partition.conf @@ -33,23 +33,3 @@ alwaysShowPartitionLabels: true # If nothing is specified, Calamares defaults to "ext4". defaultFileSystemType: "btrfs" -# 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/LUKS-Deployment -# -# If nothing is specified, LUKS is enabled in automated modes. -#enableLuksAutomatedPartitioning: true diff --git a/calamares/calamares-config-global/modules/umount.conf b/calamares/calamares-config-global/modules/umount.conf index be4a295..0139071 100644 --- a/calamares/calamares-config-global/modules/umount.conf +++ b/calamares/calamares-config-global/modules/umount.conf @@ -1,9 +1,3 @@ --- -#srcLog: "/path/to/installation.log" -#destLog: "/var/log/installation.log" -# example when using the Calamares created log: srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" destLog: "/var/log/Calamares-installation.log" -# example when creating with a sudo calamares -d log: -#srcLog: "/home/guest/installation.log" -#destLog: "/var/log/installation.log" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
