From 10a0a8621f747434f450002f0d117661a6122209 Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@garg.io>
Date: Tue, 22 Sep 2015 17:22:48 +0200
Subject: [PATCH] Update settings to new format

---
 .../modules/{webview.conf => owncloud.conf}   |  0
 .../{interactiveterminal.conf => resize.conf} |  0
 debian/settings.conf                          | 93 ++++++-------------
 3 files changed, 30 insertions(+), 63 deletions(-)
 rename debian/modules/{webview.conf => owncloud.conf} (100%)
 rename debian/modules/{interactiveterminal.conf => resize.conf} (100%)

diff --git a/debian/modules/webview.conf b/debian/modules/owncloud.conf
similarity index 100%
rename from debian/modules/webview.conf
rename to debian/modules/owncloud.conf
diff --git a/debian/modules/interactiveterminal.conf b/debian/modules/resize.conf
similarity index 100%
rename from debian/modules/interactiveterminal.conf
rename to debian/modules/resize.conf
diff --git a/debian/settings.conf b/debian/settings.conf
index 4315376..2f6d3cf 100644
--- a/debian/settings.conf
+++ b/debian/settings.conf
@@ -1,69 +1,36 @@
-# Configuration file for Calamares
-# Syntax is YAML 1.2
 ---
-# Modules can be job modules (with different interfaces) and QtWidgets view modules.
-# They could all be placed in a number of different paths.
-# "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, so a viewmodule name can appear in more than one phase.
+instances:
+  -
+    config: owncloud.conf
+    id:     owncloud
+    module: webview
+  -
+    config: resize.conf
+    id:     interactiveterminal
+    module: resize
+
+sequence:
+  -show:
+      - welcome
+      - locale
+      - keyboard
+      - users
+      - webview@owncloud
+      - interactiveterminal@resize
+  -exec:
+      - machineid
+      - locale
+      - localecfg
+      - keyboard
+      - users
+      - networkcfg
+      - services
+      - displaymanager
+  -show:
+      - finished
 
-# 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:
-- welcome
-- locale
-- keyboard
-- users
-- webview
-# Very very specific to the ODROID and created by the ODROID image scripts
-- interactiveterminal
-
-# Phase 2 - install.
-# View modules are not shown. Only the view modules shown in the previous phase are
-# allowed, their names should be added here as placeholders to specify the order in
-# which view module jobs should be enqueued. Job modules are also allowed.
-install:
-- machineid
-- locale
-- localecfg
-- keyboard
-- users
-- networkcfg
-- services
-- displaymanager
-#- packages
-#- removeuser
-
-
-# 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:
-- 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 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: netrunner-debian
-
-# 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
-
 dont-chroot: true
-
+prompt-install: false