From 76a8bc0a600af07c3935a24ccee13b8b9063353c Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@garg.io>
Date: Wed, 27 Apr 2016 21:05:47 +0200
Subject: [PATCH] Update settings for armhf and amd64

---
 etc/calamares/modules/unpackfs.conf           |  5 +++
 etc/calamares/settings.conf.amd64             | 39 +++++++++++++++++++
 .../{settings.conf => settings.conf.armhf}    |  5 ++-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 etc/calamares/modules/unpackfs.conf
 create mode 100644 etc/calamares/settings.conf.amd64
 rename etc/calamares/{settings.conf => settings.conf.armhf} (86%)

diff --git a/etc/calamares/modules/unpackfs.conf b/etc/calamares/modules/unpackfs.conf
new file mode 100644
index 0000000..9519c23
--- /dev/null
+++ b/etc/calamares/modules/unpackfs.conf
@@ -0,0 +1,5 @@
+---
+unpack:
+    -   source: "/lib/live/mount/medium/live/filesystem.squashfs"
+        sourcefs: "squashfs"
+        destination: ""
diff --git a/etc/calamares/settings.conf.amd64 b/etc/calamares/settings.conf.amd64
new file mode 100644
index 0000000..01951b3
--- /dev/null
+++ b/etc/calamares/settings.conf.amd64
@@ -0,0 +1,39 @@
+---
+modules-search: [ local ]
+
+sequence:
+
+  - show:
+    - welcome
+    - locale
+    - keyboard
+    - partition
+    - users
+    - summary
+
+  - exec:
+    - partition
+    - mount
+    - unpackfs
+    - machineid
+    - fstab
+    - locale
+    - keyboard
+    - localecfg
+    - users
+    - displaymanager
+    - networkcfg
+    - hwclock
+    - services
+    # Add initramfs module for Debian
+    - initramfs
+    - grubcfg
+    - bootloader
+    - umount
+
+  - show:
+    - finished
+
+
+branding: netrunner-core
+prompt-install: false
diff --git a/etc/calamares/settings.conf b/etc/calamares/settings.conf.armhf
similarity index 86%
rename from etc/calamares/settings.conf
rename to etc/calamares/settings.conf.armhf
index 1414a56..7efd746 100644
--- a/etc/calamares/settings.conf
+++ b/etc/calamares/settings.conf.armhf
@@ -13,9 +13,10 @@ sequence:
       - locale
       - keyboard
       - users
-      - @TERMINAL_RESIZE@
+      - interactiveterminal@resize
   - exec:
       - machineid
+      - hwclock
       - locale
       - localecfg
       - keyboard
@@ -27,5 +28,5 @@ sequence:
       - finished
 
 branding: netrunner-core
-dont-chroot: @CHROOT@
+dont-chroot: true
 prompt-install: false