From 5fad30b632e4a84eaf7bf7ebc2b3e0673581b050 Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@garg.io>
Date: Fri, 17 Jul 2015 15:45:55 +0200
Subject: [PATCH] Update settings.conf

---
 debian/settings.conf | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/debian/settings.conf b/debian/settings.conf
index 023c0d9..8fcf8cd 100644
--- a/debian/settings.conf
+++ b/debian/settings.conf
@@ -3,23 +3,25 @@
 ---
 # Modules can be job modules (with different interfaces) and QtWidgets view modules.
 # They could all be placed in a number of different paths.
-# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
-modules-search: [ local, /path/to/dir/with/more/modules ]
+# "modules-search" is a list of strings, each of these can either be a full path to a
+# directory or the keyword "local".
+# "local" means LIBDIR/calamares/modules with settings in SHARE/calamares/modules or
+# /etc/calamares/modules.
+modules-search: [ local ]
 
 # We define the module names in the order they should show up (QtWidget view modules,
 # with one or more pages) OR be executed if enqueued (all other modules).
 # Pages can also enqueue jobs for delayed execution in the order specified for the
-# install phase.
+# install phase, so a viewmodule name can appear in more than one phase.
 
 # Phase 1 - prepare.
 # View modules are shown as UI pages, jobs from job modules are executed immediately in
 # the background.
 # Jobs should be executed sparingly (if at all) in this phase.
 prepare:
-- greeting
+- welcome
 - locale
 - keyboard
-- prepare
 - partition
 - users
 - summary
@@ -34,34 +36,43 @@ install:
 - partition
 - mount
 - unpackfs
+- machineid
 - fstab
 - locale
 - keyboard
+- localecfg
 # Not required for Debian
 #- initcpiocfg
 #- initcpio
-- packages
 - users
+- displaymanager
 - networkcfg
 - hwclock
 - services
+#- dracut
+# Add initramfs module for Debian
+- initramfs
 - grubcfg
 - bootloader
-- initramfs
 - umount
 
 # Phase 3 - postinstall.
 # View modules are shown as UI pages, jobs from job modules are executed immediately in
 # the background.
 # Jobs should be executed sparingly (if at all) in this phase.
-postinstall: #TODO: actually use this
+postinstall:
 - finished
 
 
 # A branding component is a directory, either in SHARE/calamares/branding or in
 # /etc/calamares/branding (the latter takes precedence). The directory must contain a
-# YAML file branding.desc which may reference additional resources (such as images) as
-# paths relative to the current directory.
+# YAML file branding.desc which may reference additional resources (such as images or QML)
+# as paths relative to the current directory.
 # Only the name of the branding component (directory) should be specified here, Calamares
 # then takes care of finding it and loading the contents.
 branding: default
+
+# If this is set to true, Calamares will show an "are you sure?" prompt right before the
+# install phase, i.e. at the point of no return. If it's false, no prompt is shown.
+# Default is false.
+prompt-install: false