first attempt to configure calamares to our new iso layout

5 files changed, 8 insertions, 9 deletions

diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0.ebuild
index 11600728..11600728 100644
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild
+++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0.ebuild
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