From ee906e92db9e459d25f1768f601c63afe466443e Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@garg.io>
Date: Mon, 24 Aug 2015 17:17:18 +0200
Subject: [PATCH] * Add a interactive terminal module conf * Make sure we use
 the preexisting sudo group for admin privs * Move all the module configs into
 the debian/modules folder * Drop the fs_resize process job * Update configs

---
 debian/calamares.install                | 6 +-----
 debian/fs_resize/module.desc            | 7 -------
 debian/modules/interactiveterminal.conf | 2 ++
 debian/{ => modules}/packages.conf      | 0
 debian/{ => modules}/users.conf         | 1 +
 debian/{ => modules}/webview.conf       | 0
 debian/{ => modules}/welcome.conf       | 0
 debian/settings.conf                    | 2 +-
 8 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 debian/fs_resize/module.desc
 create mode 100644 debian/modules/interactiveterminal.conf
 rename debian/{ => modules}/packages.conf (100%)
 rename debian/{ => modules}/users.conf (67%)
 rename debian/{ => modules}/webview.conf (100%)
 rename debian/{ => modules}/welcome.conf (100%)

diff --git a/debian/calamares.install b/debian/calamares.install
index b82efd5..7da1d94 100644
--- a/debian/calamares.install
+++ b/debian/calamares.install
@@ -1,8 +1,4 @@
 # ODROID specific module to resize partitions
-debian/fs_resize /usr/lib/calamares/modules/
-debian/packages.conf /etc/calamares/modules/
 debian/settings.conf /etc/calamares/
-debian/users.conf /etc/calamares/modules/
-debian/webview.conf /etc/calamares/modules/
-debian/welcome.conf /etc/calamares/modules/
+debian/modules/* /etc/calamares/modules/
 usr/*
diff --git a/debian/fs_resize/module.desc b/debian/fs_resize/module.desc
deleted file mode 100644
index 84a3eb5..0000000
--- a/debian/fs_resize/module.desc
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type:       "job"
-name:       "fs_resize"
-interface:  "process"
-chroot:     false
-command:    "konsole --nofork -e \"sudo /usr/local/bin/fs_resize)\""
-timeout:    120
diff --git a/debian/modules/interactiveterminal.conf b/debian/modules/interactiveterminal.conf
new file mode 100644
index 0000000..a3634ef
--- /dev/null
+++ b/debian/modules/interactiveterminal.conf
@@ -0,0 +1,2 @@
+---
+command:        "/usr/local/bin/fs_resize"
diff --git a/debian/packages.conf b/debian/modules/packages.conf
similarity index 100%
rename from debian/packages.conf
rename to debian/modules/packages.conf
diff --git a/debian/users.conf b/debian/modules/users.conf
similarity index 67%
rename from debian/users.conf
rename to debian/modules/users.conf
index 1ce288f..538abe7 100644
--- a/debian/users.conf
+++ b/debian/modules/users.conf
@@ -1,3 +1,4 @@
 ---
 doAutologin: true
 setRootPassword: false
+sudoersGroup:    sudo
diff --git a/debian/webview.conf b/debian/modules/webview.conf
similarity index 100%
rename from debian/webview.conf
rename to debian/modules/webview.conf
diff --git a/debian/welcome.conf b/debian/modules/welcome.conf
similarity index 100%
rename from debian/welcome.conf
rename to debian/modules/welcome.conf
diff --git a/debian/settings.conf b/debian/settings.conf
index 15826e3..e22b025 100644
--- a/debian/settings.conf
+++ b/debian/settings.conf
@@ -42,7 +42,7 @@ install:
 #- removeuser
 
 # Very very specific to the ODROID and created by the ODROID image scripts
-- fs_resize
+- interactiveterminal
 
 # Phase 3 - postinstall.
 # View modules are shown as UI pages, jobs from job modules are executed immediately in