|
Kevin Kofler |
a2598f5 |
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf calamares-default-settings/settings.conf
|
|
Kevin Kofler |
a2598f5 |
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf 2015-01-05 09:45:40.000000000 +0100
|
|
Kevin Kofler |
a2598f5 |
+++ calamares-default-settings/settings.conf 2015-01-10 03:52:57.000000000 +0100
|
|
Kevin Kofler |
e9ec4ff |
@@ -4,7 +4,7 @@
|
|
Kevin Kofler |
e9ec4ff |
# Modules can be job modules (with different interfaces) and QtWidgets view modules.
|
|
Kevin Kofler |
e9ec4ff |
# They could all be placed in a number of different paths.
|
|
Kevin Kofler |
e9ec4ff |
# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
|
|
Kevin Kofler |
e9ec4ff |
-modules-search: [ local, /path/to/dir/with/more/modules ]
|
|
Kevin Kofler |
e9ec4ff |
+modules-search: [ local ]
|
|
Kevin Kofler |
e9ec4ff |
|
|
Kevin Kofler |
e9ec4ff |
# We define the module names in the order they should show up (QtWidget view modules,
|
|
Kevin Kofler |
e9ec4ff |
# with one or more pages) OR be executed if enqueued (all other modules).
|
|
Kevin Kofler |
a2598f5 |
@@ -39,18 +39,19 @@
|
|
Kevin Kofler |
e9ec4ff |
- locale
|
|
Kevin Kofler |
e9ec4ff |
- keyboard
|
|
Kevin Kofler |
0231205 |
- localecfg
|
|
Kevin Kofler |
e9ec4ff |
-- initcpiocfg
|
|
Kevin Kofler |
e9ec4ff |
-- initcpio
|
|
Kevin Kofler |
0231205 |
+#- initcpiocfg
|
|
Kevin Kofler |
0231205 |
+#- initcpio
|
|
Kevin Kofler |
e9ec4ff |
- users
|
|
Kevin Kofler |
0231205 |
-#- displaymanager
|
|
Kevin Kofler |
e9ec4ff |
+- displaymanager
|
|
Kevin Kofler |
e9ec4ff |
- networkcfg
|
|
Kevin Kofler |
e9ec4ff |
- hwclock
|
|
Kevin Kofler |
e9ec4ff |
- services
|
|
Kevin Kofler |
0231205 |
-#- dracut
|
|
Kevin Kofler |
0231205 |
+- dracut
|
|
Kevin Kofler |
0231205 |
#- initramfs
|
|
Kevin Kofler |
0231205 |
- grubcfg
|
|
Kevin Kofler |
0231205 |
- grub
|
|
Kevin Kofler |
a2598f5 |
#- bootloader
|
|
Kevin Kofler |
a2598f5 |
+- packages
|
|
Kevin Kofler |
a2598f5 |
- umount
|
|
Kevin Kofler |
a2598f5 |
|
|
Kevin Kofler |
a2598f5 |
# Phase 3 - postinstall.
|
|
Kevin Kofler |
a2598f5 |
@@ -67,4 +68,4 @@
|
|
Kevin Kofler |
d99ca50 |
# paths relative to the current directory.
|
|
Kevin Kofler |
d99ca50 |
# Only the name of the branding component (directory) should be specified here, Calamares
|
|
Kevin Kofler |
d99ca50 |
# then takes care of finding it and loading the contents.
|
|
Kevin Kofler |
d99ca50 |
-branding: default
|
|
Kevin Kofler |
d99ca50 |
+branding: auto
|
|
Kevin Kofler |
a2598f5 |
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf
|
|
Kevin Kofler |
a2598f5 |
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/grub/grub.conf 2015-01-05 09:45:40.000000000 +0100
|
|
Kevin Kofler |
a2598f5 |
+++ calamares-default-settings/src/modules/grub/grub.conf 2015-01-10 03:48:13.000000000 +0100
|
|
Kevin Kofler |
e2f1e7d |
@@ -1,11 +1,13 @@
|
|
Kevin Kofler |
0231205 |
---
|
|
Kevin Kofler |
0231205 |
# GRUB 2 binary names and boot directory
|
|
Kevin Kofler |
0231205 |
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
|
|
Kevin Kofler |
0231205 |
-grubInstall: "grub-install"
|
|
Kevin Kofler |
0231205 |
-grubMkconfig: "grub-mkconfig"
|
|
Kevin Kofler |
0231205 |
-grubCfg: "/boot/grub/grub.cfg"
|
|
Kevin Kofler |
0231205 |
+grubInstall: "grub2-install"
|
|
Kevin Kofler |
0231205 |
+grubMkconfig: "grub2-mkconfig"
|
|
Kevin Kofler |
0231205 |
+grubCfg: "/boot/grub2/grub.cfg"
|
|
Kevin Kofler |
e2f1e7d |
# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
|
|
Kevin Kofler |
e2f1e7d |
# to the bootloaderEntryName from branding.desc with problematic characters
|
|
Kevin Kofler |
e2f1e7d |
# replaced. If an efiBootloaderId is specified here, it is taken to already be a
|
|
Kevin Kofler |
e2f1e7d |
# valid directory name, so no such postprocessing is done in this case.
|
|
Kevin Kofler |
e2f1e7d |
-# efiBootloaderId: "dirname"
|
|
Kevin Kofler |
e2f1e7d |
+# PACKAGER NOTE: If you really want to change this value, you will also have to
|
|
Kevin Kofler |
e2f1e7d |
+# change the hardcoded directory name in the grub2(-efi) package.
|
|
Kevin Kofler |
e2f1e7d |
+efiBootloaderId: "fedora"
|
|
Kevin Kofler |
a2598f5 |
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf
|
|
Kevin Kofler |
a2598f5 |
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/locale/locale.conf 2015-01-05 09:45:40.000000000 +0100
|
|
Kevin Kofler |
a2598f5 |
+++ calamares-default-settings/src/modules/locale/locale.conf 2015-01-10 03:48:13.000000000 +0100
|
|
Kevin Kofler |
e9ec4ff |
@@ -1,3 +1,4 @@
|
|
Kevin Kofler |
e9ec4ff |
---
|
|
Kevin Kofler |
e9ec4ff |
-region: "Europe"
|
|
Kevin Kofler |
e9ec4ff |
-zone: "London"
|
|
Kevin Kofler |
e9ec4ff |
+# default to UTC
|
|
Kevin Kofler |
e9ec4ff |
+region: "Atlantic"
|
|
Kevin Kofler |
e9ec4ff |
+zone: "Reykjavik"
|
|
Kevin Kofler |
a2598f5 |
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages/packages.conf calamares-default-settings/src/modules/packages/packages.conf
|
|
Kevin Kofler |
a2598f5 |
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages/packages.conf 2015-01-05 09:45:40.000000000 +0100
|
|
Kevin Kofler |
a2598f5 |
+++ calamares-default-settings/src/modules/packages/packages.conf 2015-01-10 04:15:14.000000000 +0100
|
|
Kevin Kofler |
a2598f5 |
@@ -9,7 +9,7 @@
|
|
Kevin Kofler |
a2598f5 |
# - apt - APT frontend for DEB and RPM
|
|
Kevin Kofler |
a2598f5 |
# - pacman - Pacman
|
|
Kevin Kofler |
a2598f5 |
#
|
|
Kevin Kofler |
a2598f5 |
-backend: packagekit
|
|
Kevin Kofler |
a2598f5 |
+backend: dnf
|
|
Kevin Kofler |
a2598f5 |
#
|
|
Kevin Kofler |
a2598f5 |
# List of maps with package operations such as install or remove.
|
|
Kevin Kofler |
a2598f5 |
# Distro developers can provide a list of packages to remove
|
|
Kevin Kofler |
a2598f5 |
@@ -24,18 +24,7 @@
|
|
Kevin Kofler |
a2598f5 |
# storage called "packageOperations" and it is processed
|
|
Kevin Kofler |
a2598f5 |
# after the static list in the job configuration.
|
|
Kevin Kofler |
a2598f5 |
#
|
|
Kevin Kofler |
a2598f5 |
-#operations:
|
|
Kevin Kofler |
a2598f5 |
+operations:
|
|
Kevin Kofler |
a2598f5 |
+ - remove:
|
|
Kevin Kofler |
a2598f5 |
+ - calamares
|
|
Kevin Kofler |
a2598f5 |
# - install:
|
|
Kevin Kofler |
a2598f5 |
-# - pkg1
|
|
Kevin Kofler |
a2598f5 |
-# - pkg2
|
|
Kevin Kofler |
a2598f5 |
-# - remove:
|
|
Kevin Kofler |
a2598f5 |
-# - pkg3
|
|
Kevin Kofler |
a2598f5 |
-# - pkg4
|
|
Kevin Kofler |
a2598f5 |
-# - install:
|
|
Kevin Kofler |
a2598f5 |
-# - pkg5
|
|
Kevin Kofler |
a2598f5 |
-# - remove:
|
|
Kevin Kofler |
a2598f5 |
-# - pkg2
|
|
Kevin Kofler |
a2598f5 |
-# - pkg1
|
|
Kevin Kofler |
a2598f5 |
-# install:
|
|
Kevin Kofler |
a2598f5 |
-# - pkgs6
|
|
Kevin Kofler |
a2598f5 |
-# - pkg7
|
|
Kevin Kofler |
a2598f5 |
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf
|
|
Kevin Kofler |
a2598f5 |
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/unpackfs/unpackfs.conf 2015-01-05 09:45:40.000000000 +0100
|
|
Kevin Kofler |
a2598f5 |
+++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf 2015-01-10 03:48:13.000000000 +0100
|
|
Kevin Kofler |
e9ec4ff |
@@ -1,8 +1,5 @@
|
|
Kevin Kofler |
e9ec4ff |
---
|
|
Kevin Kofler |
e9ec4ff |
unpack:
|
|
Kevin Kofler |
e9ec4ff |
- - source: "/path/to/filesystem.img"
|
|
Kevin Kofler |
e9ec4ff |
+ - source: "/dev/mapper/live-base"
|
|
Kevin Kofler |
e9ec4ff |
sourcefs: "ext4"
|
|
Kevin Kofler |
e9ec4ff |
destination: ""
|
|
Kevin Kofler |
e9ec4ff |
- - source: "/path/to/another/filesystem.sqfs"
|
|
Kevin Kofler |
e9ec4ff |
- sourcefs: "squashfs"
|
|
Kevin Kofler |
e9ec4ff |
- destination: ""
|
|
Kevin Kofler |
a2598f5 |
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf
|
|
Kevin Kofler |
a2598f5 |
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/users/users.conf 2015-01-05 09:45:40.000000000 +0100
|
|
Kevin Kofler |
a2598f5 |
+++ calamares-default-settings/src/modules/users/users.conf 2015-01-10 03:48:13.000000000 +0100
|
|
Kevin Kofler |
e9ec4ff |
@@ -3,8 +3,7 @@
|
|
Kevin Kofler |
e9ec4ff |
defaultGroups:
|
|
Kevin Kofler |
e9ec4ff |
- lp
|
|
Kevin Kofler |
e9ec4ff |
- video
|
|
Kevin Kofler |
e9ec4ff |
- - network
|
|
Kevin Kofler |
e9ec4ff |
- - storage
|
|
Kevin Kofler |
e9ec4ff |
+ - dialout
|
|
Kevin Kofler |
e9ec4ff |
- wheel
|
|
Kevin Kofler |
e9ec4ff |
- audio
|
|
Kevin Kofler |
e9ec4ff |
autologinGroup: autologin
|