|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/settings.conf calamares-1.1.3-default-settings/settings.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/settings.conf 2015-09-14 17:48:01.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/settings.conf 2015-09-26 01:24:33.164575482 +0200
|
|
Kevin Kofler |
397b373 |
@@ -20,12 +20,12 @@
|
|
Kevin Kofler |
397b373 |
# Jobs should be executed sparingly (if at all) in this phase.
|
|
Kevin Kofler |
397b373 |
prepare:
|
|
Kevin Kofler |
397b373 |
- welcome
|
|
Kevin Kofler |
397b373 |
-- license
|
|
Kevin Kofler |
397b373 |
+#- license
|
|
Kevin Kofler |
397b373 |
- locale
|
|
Kevin Kofler |
397b373 |
- keyboard
|
|
Kevin Kofler |
397b373 |
- partition
|
|
Kevin Kofler |
397b373 |
- users
|
|
Kevin Kofler |
397b373 |
-- webview
|
|
Kevin Kofler |
397b373 |
+#- webview
|
|
Kevin Kofler |
397b373 |
- summary
|
|
Kevin Kofler |
397b373 |
|
|
Kevin Kofler |
397b373 |
# Phase 2 - install.
|
|
Kevin Kofler |
397b373 |
@@ -43,17 +43,18 @@
|
|
Kevin Kofler |
397b373 |
- locale
|
|
Kevin Kofler |
397b373 |
- keyboard
|
|
Kevin Kofler |
397b373 |
- localecfg
|
|
Kevin Kofler |
397b373 |
-- initcpiocfg
|
|
Kevin Kofler |
397b373 |
-- initcpio
|
|
Kevin Kofler |
397b373 |
+#- initcpiocfg
|
|
Kevin Kofler |
397b373 |
+#- initcpio
|
|
Kevin Kofler |
397b373 |
- users
|
|
Kevin Kofler |
397b373 |
- displaymanager
|
|
Kevin Kofler |
397b373 |
- networkcfg
|
|
Kevin Kofler |
397b373 |
- hwclock
|
|
Kevin Kofler |
397b373 |
- services
|
|
Kevin Kofler |
397b373 |
-#- dracut
|
|
Kevin Kofler |
397b373 |
+- dracut
|
|
Kevin Kofler |
397b373 |
#- initramfs
|
|
Kevin Kofler |
397b373 |
- grubcfg
|
|
Kevin Kofler |
397b373 |
- bootloader
|
|
Kevin Kofler |
397b373 |
+- packages
|
|
Kevin Kofler |
397b373 |
- umount
|
|
Kevin Kofler |
397b373 |
|
|
Kevin Kofler |
397b373 |
# Phase 3 - postinstall.
|
|
Kevin Kofler |
397b373 |
@@ -70,7 +71,7 @@
|
|
Kevin Kofler |
397b373 |
# as paths relative to the current directory.
|
|
Kevin Kofler |
397b373 |
# Only the name of the branding component (directory) should be specified here, Calamares
|
|
Kevin Kofler |
397b373 |
# then takes care of finding it and loading the contents.
|
|
Kevin Kofler |
397b373 |
-branding: default
|
|
Kevin Kofler |
397b373 |
+branding: auto
|
|
Kevin Kofler |
397b373 |
|
|
Kevin Kofler |
397b373 |
# If this is set to true, Calamares will show an "are you sure?" prompt right before the
|
|
Kevin Kofler |
397b373 |
# install phase, i.e. at the point of no return. If it's false, no prompt is shown.
|
|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/src/modules/bootloader/bootloader.conf calamares-1.1.3-default-settings/src/modules/bootloader/bootloader.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/src/modules/bootloader/bootloader.conf 2015-08-06 11:58:32.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/src/modules/bootloader/bootloader.conf 2015-09-26 01:23:55.545357323 +0200
|
|
Kevin Kofler |
397b373 |
@@ -17,11 +17,13 @@
|
|
Kevin Kofler |
397b373 |
|
|
Kevin Kofler |
397b373 |
# GRUB 2 binary names and boot directory
|
|
Kevin Kofler |
397b373 |
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
|
|
Kevin Kofler |
397b373 |
-grubInstall: "grub-install"
|
|
Kevin Kofler |
397b373 |
-grubMkconfig: "grub-mkconfig"
|
|
Kevin Kofler |
397b373 |
-grubCfg: "/boot/grub/grub.cfg"
|
|
Kevin Kofler |
397b373 |
+grubInstall: "grub2-install"
|
|
Kevin Kofler |
397b373 |
+grubMkconfig: "grub2-mkconfig"
|
|
Kevin Kofler |
397b373 |
+grubCfg: "/boot/grub2/grub.cfg"
|
|
Kevin Kofler |
397b373 |
# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
|
|
Kevin Kofler |
397b373 |
# to the bootloaderEntryName from branding.desc with problematic characters
|
|
Kevin Kofler |
397b373 |
# replaced. If an efiBootloaderId is specified here, it is taken to already be a
|
|
Kevin Kofler |
397b373 |
# valid directory name, so no such postprocessing is done in this case.
|
|
Kevin Kofler |
397b373 |
-# efiBootloaderId: "dirname"
|
|
Kevin Kofler |
397b373 |
+# PACKAGER NOTE: If you really want to change this value, you will also have to
|
|
Kevin Kofler |
397b373 |
+# change the hardcoded directory name in the grub2(-efi) package.
|
|
Kevin Kofler |
397b373 |
+efiBootloaderId: "fedora"
|
|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/src/modules/license/license.conf calamares-1.1.3-default-settings/src/modules/license/license.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/src/modules/license/license.conf 2015-09-14 16:51:04.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/src/modules/license/license.conf 2015-09-26 01:44:24.149437908 +0200
|
|
Kevin Kofler |
397b373 |
@@ -3,21 +3,9 @@
|
|
Kevin Kofler |
397b373 |
---
|
|
Kevin Kofler |
397b373 |
# YAML: list of maps.
|
|
Kevin Kofler |
397b373 |
entries:
|
|
Kevin Kofler |
397b373 |
-- id: nvidia # Entry identifier, must be unique. Not user visible. YAML: string.
|
|
Kevin Kofler |
397b373 |
- name: Nvidia # Pretty name for the software product, user visible and untranslatable. YAML: string.
|
|
Kevin Kofler |
397b373 |
- vendor: Nvidia Corporation # Pretty name for the software vendor, user visible and untranslatable. YAML: string, optional, default is empty.
|
|
Kevin Kofler |
397b373 |
+- id: evil # Entry identifier, must be unique. Not user visible. YAML: string.
|
|
Kevin Kofler |
397b373 |
+ name: Evil # Pretty name for the software product, user visible and untranslatable. YAML: string.
|
|
Kevin Kofler |
397b373 |
+ vendor: Evil Corporation # Pretty name for the software vendor, user visible and untranslatable. YAML: string, optional, default is empty.
|
|
Kevin Kofler |
397b373 |
type: driver # Package type for presentation, not user visible but affects user visible strings. YAML: string, allowed values: driver, gpudriver, browserplugin, codec, package, software; optional, default is software.
|
|
Kevin Kofler |
397b373 |
- url: http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf # Url of license text to display in a web view. YAML: string.
|
|
Kevin Kofler |
397b373 |
+ url: http://www.example.com/evil_666.0/license.pdf # Url of license text to display in a web view. YAML: string.
|
|
Kevin Kofler |
397b373 |
required: false # If set to true, the user cannot proceed without accepting this license. YAML: boolean, optional, default is false.
|
|
Kevin Kofler |
397b373 |
-- id: amd
|
|
Kevin Kofler |
397b373 |
- name: Catalyst
|
|
Kevin Kofler |
397b373 |
- vendor: "Advanced Micro Devices, Inc."
|
|
Kevin Kofler |
397b373 |
- type: gpudriver
|
|
Kevin Kofler |
397b373 |
- url: http://support.amd.com/en-us/download/eula
|
|
Kevin Kofler |
397b373 |
- required: false
|
|
Kevin Kofler |
397b373 |
-- id: flashplugin
|
|
Kevin Kofler |
397b373 |
- name: Adobe Flash
|
|
Kevin Kofler |
397b373 |
- vendor: Adobe Systems Incorporated
|
|
Kevin Kofler |
397b373 |
- type: browserplugin
|
|
Kevin Kofler |
397b373 |
- url: http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf
|
|
Kevin Kofler |
397b373 |
- required: true
|
|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/src/modules/locale/locale.conf calamares-1.1.3-default-settings/src/modules/locale/locale.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/src/modules/locale/locale.conf 2015-08-06 11:58:34.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/src/modules/locale/locale.conf 2015-09-26 01:23:55.580357527 +0200
|
|
Kevin Kofler |
397b373 |
@@ -1,3 +1,4 @@
|
|
Kevin Kofler |
397b373 |
---
|
|
Kevin Kofler |
397b373 |
-region: "Europe"
|
|
Kevin Kofler |
397b373 |
-zone: "London"
|
|
Kevin Kofler |
397b373 |
+# default to UTC
|
|
Kevin Kofler |
397b373 |
+region: "Atlantic"
|
|
Kevin Kofler |
397b373 |
+zone: "Reykjavik"
|
|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/src/modules/packages/packages.conf calamares-1.1.3-default-settings/src/modules/packages/packages.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/src/modules/packages/packages.conf 2015-08-06 11:58:32.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/src/modules/packages/packages.conf 2015-09-26 01:23:55.609357696 +0200
|
|
Kevin Kofler |
397b373 |
@@ -11,7 +11,7 @@
|
|
Kevin Kofler |
397b373 |
# - portage - Gentoo package manager
|
|
Kevin Kofler |
397b373 |
# - entropy - Sabayon package manager
|
|
Kevin Kofler |
397b373 |
#
|
|
Kevin Kofler |
397b373 |
-backend: packagekit
|
|
Kevin Kofler |
397b373 |
+backend: dnf
|
|
Kevin Kofler |
397b373 |
#
|
|
Kevin Kofler |
397b373 |
# List of maps with package operations such as install or remove.
|
|
Kevin Kofler |
397b373 |
# Distro developers can provide a list of packages to remove
|
|
Kevin Kofler |
397b373 |
@@ -26,20 +26,7 @@
|
|
Kevin Kofler |
397b373 |
# storage called "packageOperations" and it is processed
|
|
Kevin Kofler |
397b373 |
# after the static list in the job configuration.
|
|
Kevin Kofler |
397b373 |
#
|
|
Kevin Kofler |
397b373 |
-#operations:
|
|
Kevin Kofler |
397b373 |
+operations:
|
|
Kevin Kofler |
397b373 |
+ - remove:
|
|
Kevin Kofler |
397b373 |
+ - calamares
|
|
Kevin Kofler |
397b373 |
# - install:
|
|
Kevin Kofler |
397b373 |
-# - pkg1
|
|
Kevin Kofler |
397b373 |
-# - pkg2
|
|
Kevin Kofler |
397b373 |
-# - remove:
|
|
Kevin Kofler |
397b373 |
-# - pkg3
|
|
Kevin Kofler |
397b373 |
-# - pkg4
|
|
Kevin Kofler |
397b373 |
-# - install:
|
|
Kevin Kofler |
397b373 |
-# - pkg5
|
|
Kevin Kofler |
397b373 |
-# - remove:
|
|
Kevin Kofler |
397b373 |
-# - pkg2
|
|
Kevin Kofler |
397b373 |
-# - pkg1
|
|
Kevin Kofler |
397b373 |
-# install:
|
|
Kevin Kofler |
397b373 |
-# - pkgs6
|
|
Kevin Kofler |
397b373 |
-# - pkg7
|
|
Kevin Kofler |
397b373 |
-# - localInstall:
|
|
Kevin Kofler |
397b373 |
-# - /path/to/pkg8
|
|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/src/modules/services/services.conf calamares-1.1.3-default-settings/src/modules/services/services.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/src/modules/services/services.conf 2015-09-10 13:18:54.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/src/modules/services/services.conf 2015-09-26 01:42:47.715883986 +0200
|
|
Kevin Kofler |
397b373 |
@@ -12,6 +12,4 @@
|
|
Kevin Kofler |
397b373 |
- name: "graphical"
|
|
Kevin Kofler |
397b373 |
mandatory: true
|
|
Kevin Kofler |
397b373 |
|
|
Kevin Kofler |
397b373 |
-disable:
|
|
Kevin Kofler |
397b373 |
- - name: "pacman-init"
|
|
Kevin Kofler |
397b373 |
- mandatory: false
|
|
Kevin Kofler |
397b373 |
+disable: []
|
|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/src/modules/unpackfs/unpackfs.conf calamares-1.1.3-default-settings/src/modules/unpackfs/unpackfs.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/src/modules/unpackfs/unpackfs.conf 2015-08-06 11:58:32.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/src/modules/unpackfs/unpackfs.conf 2015-09-26 01:23:55.630357818 +0200
|
|
Kevin Kofler |
397b373 |
@@ -1,8 +1,5 @@
|
|
Kevin Kofler |
397b373 |
---
|
|
Kevin Kofler |
397b373 |
unpack:
|
|
Kevin Kofler |
397b373 |
- - source: "/path/to/filesystem.img"
|
|
Kevin Kofler |
397b373 |
+ - source: "/dev/mapper/live-base"
|
|
Kevin Kofler |
397b373 |
sourcefs: "ext4"
|
|
Kevin Kofler |
397b373 |
destination: ""
|
|
Kevin Kofler |
397b373 |
- - source: "/path/to/another/filesystem.sqfs"
|
|
Kevin Kofler |
397b373 |
- sourcefs: "squashfs"
|
|
Kevin Kofler |
397b373 |
- destination: ""
|
|
Kevin Kofler |
397b373 |
diff -ur calamares-1.1.3/src/modules/users/users.conf calamares-1.1.3-default-settings/src/modules/users/users.conf
|
|
Kevin Kofler |
397b373 |
--- calamares-1.1.3/src/modules/users/users.conf 2015-08-19 12:52:13.000000000 +0200
|
|
Kevin Kofler |
397b373 |
+++ calamares-1.1.3-default-settings/src/modules/users/users.conf 2015-09-26 01:25:56.574056337 +0200
|
|
Kevin Kofler |
397b373 |
@@ -3,11 +3,10 @@
|
|
Kevin Kofler |
397b373 |
defaultGroups:
|
|
Kevin Kofler |
397b373 |
- lp
|
|
Kevin Kofler |
397b373 |
- video
|
|
Kevin Kofler |
397b373 |
- - network
|
|
Kevin Kofler |
397b373 |
- - storage
|
|
Kevin Kofler |
397b373 |
+ - dialout
|
|
Kevin Kofler |
397b373 |
- wheel
|
|
Kevin Kofler |
397b373 |
- audio
|
|
Kevin Kofler |
397b373 |
autologinGroup: autologin
|
|
Kevin Kofler |
397b373 |
-doAutologin: true
|
|
Kevin Kofler |
397b373 |
+doAutologin: false
|
|
Kevin Kofler |
397b373 |
sudoersGroup: wheel
|
|
Kevin Kofler |
397b373 |
setRootPassword: true
|