From 0232906577385c95265bb5377c90d4262469c19a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 6 Mar 2016 16:43:11 +0000
Subject: first attempt to configure calamares to our new iso layout

---
 .../calamares-config-kogaion-2.0-r4.ebuild         | 24 ----------------------
 .../calamares-config-kogaion-3.0.ebuild            | 24 ++++++++++++++++++++++
 .../files/modules/unpackfs.conf                    |  4 ++--
 .../files/modules/users.conf                       |  7 +++----
 .../files/modules/welcome.conf                     |  2 +-
 .../calamares-config-kogaion/files/settings.conf   |  4 ++--
 6 files changed, 32 insertions(+), 33 deletions(-)
 delete mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild
 create mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0.ebuild

diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild
deleted file mode 100644
index 11600728..00000000
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Kogaion Linux Calamares modules config"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/calamares"
-
-S="${FILESDIR}"
-
-src_install() {
-	dodir "/etc/calamares" || die
-	insinto "/etc/calamares" || die
-	doins -r "${S}/"* || die
-}
diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0.ebuild
new file mode 100644
index 00000000..11600728
--- /dev/null
+++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Kogaion Linux Calamares modules config"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-admin/calamares"
+
+S="${FILESDIR}"
+
+src_install() {
+	dodir "/etc/calamares" || die
+	insinto "/etc/calamares" || die
+	doins -r "${S}/"* || die
+}
diff --git a/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf b/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf
index 641f5ae0..82078244 100644
--- a/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf
@@ -1,5 +1,5 @@
 ---
 unpack:
-    -   source: "/mnt/cdrom/livecd.squashfs"
-        sourcefs: "squashfs"
+    -   source: "/dev/mapper/live-rw"
+        sourcefs: "ext4"
         destination: ""
diff --git a/app-misc/calamares-config-kogaion/files/modules/users.conf b/app-misc/calamares-config-kogaion/files/modules/users.conf
index cec4257a..2ef3557b 100644
--- a/app-misc/calamares-config-kogaion/files/modules/users.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/users.conf
@@ -3,8 +3,9 @@ userGroup:       users
 defaultGroups:
     - lp
     - video
-    - network
-    - storage
+    - tape
+    - uucp
+    - disk
     - wheel
     - audio
     - cdrom
@@ -13,6 +14,4 @@ defaultGroups:
     - plugdev
     - portage
     - messagebus
-autologinGroup:  autologin
-sudoersGroup:    wheel
 setRootPassword: true
diff --git a/app-misc/calamares-config-kogaion/files/modules/welcome.conf b/app-misc/calamares-config-kogaion/files/modules/welcome.conf
index 29bcd5fb..7e4f3404 100644
--- a/app-misc/calamares-config-kogaion/files/modules/welcome.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/welcome.conf
@@ -4,7 +4,7 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true
 
 requirements:
-    requiredStorage:    15.0
+    requiredStorage:    10.0
     requiredRam:        1.0
     check:
         - storage
diff --git a/app-misc/calamares-config-kogaion/files/settings.conf b/app-misc/calamares-config-kogaion/files/settings.conf
index 4089a654..41085536 100644
--- a/app-misc/calamares-config-kogaion/files/settings.conf
+++ b/app-misc/calamares-config-kogaion/files/settings.conf
@@ -41,10 +41,10 @@ install:
 #- initcpiocfg
 #- initcpio
 - users
-- displaymanager
+#- displaymanager
 - networkcfg
 - hwclock
-#- dracut
+- dracut
 #- initramfs
 - packages
 - grubcfg
-- 
cgit v1.2.3