7 files changed, 47 insertions, 5 deletions
diff --git a/auto/config b/auto/config
index 33f2490..8b1fa45 100755
--- a/auto/config
+++ b/auto/config
@@ -33,11 +33,11 @@ eval set -- "$temp"
 
 case "$arch" in
     amd64)
-	lb_opts="$lb_opts --debian-installer live"
+	lb_opts="$lb_opts --debian-installer none"
 	lb_opts="$lb_opts --linux-flavours amd64"
     ;;
     i386)
-	lb_opts="$lb_opts --debian-installer live"
+	lb_opts="$lb_opts --debian-installer none"
 	lb_opts="$lb_opts --linux-flavours 686-pae"
     ;;
     armel|armhf)
@@ -51,7 +51,6 @@ esac
 lb config noauto \
 	--archive-areas "main contrib non-free-firmware non-free" \
 	--bootappend-live "boot=live quiet splash" \
-	--debian-installer-distribution daily \
 	--distribution "$dist" \
 	--firmware-binary true \
 	--firmware-chroot true \
diff --git a/config/includes.chroot/etc/calamares/modules/displaymanager.conf b/config/includes.chroot/etc/calamares/modules/displaymanager.conf
new file mode 100644
index 0000000..70c7d35
--- /dev/null
+++ b/config/includes.chroot/etc/calamares/modules/displaymanager.conf
@@ -0,0 +1,7 @@
+---
+displaymanagers:
+  - lightdm
+
+defaultDesktopEnvironment:
+    executable: "startxfce4"
+    desktopFile: "xebian"
diff --git a/config/includes.chroot/etc/calamares/modules/packages.conf b/config/includes.chroot/etc/calamares/modules/packages.conf
new file mode 100644
index 0000000..42258b5
--- /dev/null
+++ b/config/includes.chroot/etc/calamares/modules/packages.conf
@@ -0,0 +1,15 @@
+backend: apt
+
+operations:
+  - remove:
+      - 'calamares'
+      - 'calamares-settings-debian'
+      - 'gparted'
+      - 'live-boot'
+      - 'live-boot-doc'
+      - 'live-config'
+      - 'live-config-doc'
+      - 'live-config-systemd'
+      - 'live-task-localisation'
+      - 'live-task-recommended'
+      - 'live-tools'
diff --git a/config/includes.chroot/etc/calamares/modules/welcome.conf b/config/includes.chroot/etc/calamares/modules/welcome.conf
new file mode 100644
index 0000000..097253b
--- /dev/null
+++ b/config/includes.chroot/etc/calamares/modules/welcome.conf
@@ -0,0 +1,17 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+
+requirements:
+    requiredStorage:    3
+    requiredRam:        1.0
+    check:
+        - storage
+        - ram
+        - power
+        - root
+    required:
+        - storage
+        - ram
+        - root
diff --git a/config/includes.chroot/usr/sbin/sources-final b/config/includes.chroot/usr/sbin/sources-final
new file mode 100755
index 0000000..039e4d0
--- /dev/null
+++ b/config/includes.chroot/usr/sbin/sources-final
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0
diff --git a/config/includes.chroot/usr/sbin/sources-media b/config/includes.chroot/usr/sbin/sources-media
new file mode 100755
index 0000000..039e4d0
--- /dev/null
+++ b/config/includes.chroot/usr/sbin/sources-media
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0
diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot
index f60b2b5..25cf9c6 100644
--- a/config/package-lists/live.list.chroot
+++ b/config/package-lists/live.list.chroot
@@ -1,5 +1,5 @@
+calamares-settings-debian
+gparted
 live-boot
 live-config
 live-config-systemd
-dbus
-gparted