From 723c90a6e3bb24a25e47be2103caa68fcbd74e47 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 26 Jul 2015 14:57:31 +0100
Subject: insert disable kogaionlive services into calamares src tree, disable
 kogaionlive services during installation, enable lightdm service

---
 .../calamares-config-kogaion-2.0-r1.ebuild         | 24 ----------------------
 .../calamares-config-kogaion-2.0-r2.ebuild         | 24 ++++++++++++++++++++++
 .../files/modules/liveservices.conf                | 21 +++++++++++++++++++
 .../files/modules/services.conf                    |  9 ++++++++
 .../calamares-config-kogaion/files/settings.conf   |  1 +
 5 files changed, 55 insertions(+), 24 deletions(-)
 delete mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r1.ebuild
 create mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r2.ebuild
 create mode 100644 app-misc/calamares-config-kogaion/files/modules/liveservices.conf
 create mode 100644 app-misc/calamares-config-kogaion/files/modules/services.conf

(limited to 'app-misc')

diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r1.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r1.ebuild
deleted file mode 100644
index e46b065f..00000000
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r1.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-2.0-r2.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r2.ebuild
new file mode 100644
index 00000000..e46b065f
--- /dev/null
+++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r2.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/liveservices.conf b/app-misc/calamares-config-kogaion/files/modules/liveservices.conf
new file mode 100644
index 00000000..826b25cf
--- /dev/null
+++ b/app-misc/calamares-config-kogaion/files/modules/liveservices.conf
@@ -0,0 +1,21 @@
+---
+#systemd kogaion live services are disabled in this precise order
+
+services:
+  - name: "x-setup"  #name of the service file
+    mandatory: false        #true=> if disabling fails the installer errors out and quits
+                            #false=>if disabling fails print warning to console and continue
+  - name: "cdeject"
+    mandatory: false
+
+  - name: "installer-text"
+    mandatory: false
+
+  - name: "installer-gui"
+    mandatory: false
+
+  - name: "graphical_start"
+    mandatory: false
+
+  - name: "kogaionlive"
+    mandatory: false
diff --git a/app-misc/calamares-config-kogaion/files/modules/services.conf b/app-misc/calamares-config-kogaion/files/modules/services.conf
new file mode 100644
index 00000000..f5b22f4e
--- /dev/null
+++ b/app-misc/calamares-config-kogaion/files/modules/services.conf
@@ -0,0 +1,9 @@
+---
+#systemd services and targets are enabled in this precise order
+
+services:
+  - name: "NetworkManager"  #name of the service file
+    mandatory: false        #true=> if enabling fails the installer errors out and quits
+                            #false=>if enabling fails print warning to console and continue
+  - name: "lightdm"
+    mandatory: false
diff --git a/app-misc/calamares-config-kogaion/files/settings.conf b/app-misc/calamares-config-kogaion/files/settings.conf
index 2b5bc533..04911775 100644
--- a/app-misc/calamares-config-kogaion/files/settings.conf
+++ b/app-misc/calamares-config-kogaion/files/settings.conf
@@ -44,6 +44,7 @@ install:
 - displaymanager
 - networkcfg
 - hwclock
+- liveservices
 - services
 #- dracut
 #- initramfs
-- 
cgit v1.2.3