From d3b9de9e515a63d6b780435704aa2d1430b36ad5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Tue, 22 Mar 2016 15:39:32 +0000
Subject: use live-base as installation source, drop removeuser hook, we don't
 need it with live-base

---
 .../calamares-config-kogaion-3.0-r2.ebuild         | 24 ----------------------
 .../calamares-config-kogaion-3.0-r3.ebuild         | 24 ++++++++++++++++++++++
 .../files/modules/removeuser.conf                  |  2 --
 .../files/modules/unpackfs.conf                    |  2 +-
 .../calamares-config-kogaion/files/settings.conf   |  1 -
 5 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r2.ebuild
 create mode 100644 app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r3.ebuild
 delete mode 100644 app-misc/calamares-config-kogaion/files/modules/removeuser.conf

(limited to 'app-misc')

diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r2.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r2.ebuild
deleted file mode 100644
index 11600728..00000000
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r2.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-r3.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r3.ebuild
new file mode 100644
index 00000000..11600728
--- /dev/null
+++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r3.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/removeuser.conf b/app-misc/calamares-config-kogaion/files/modules/removeuser.conf
deleted file mode 100644
index 82e03559..00000000
--- a/app-misc/calamares-config-kogaion/files/modules/removeuser.conf
+++ /dev/null
@@ -1,2 +0,0 @@
----
-username: kogaion
diff --git a/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf b/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf
index 82078244..91eca93e 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: "/dev/mapper/live-rw"
+    -   source: "/dev/mapper/live-base"
         sourcefs: "ext4"
         destination: ""
diff --git a/app-misc/calamares-config-kogaion/files/settings.conf b/app-misc/calamares-config-kogaion/files/settings.conf
index 7139bd34..c444adea 100644
--- a/app-misc/calamares-config-kogaion/files/settings.conf
+++ b/app-misc/calamares-config-kogaion/files/settings.conf
@@ -37,7 +37,6 @@ install:
 - keyboard
 - localecfg
 - users
-- removeuser
 - displaymanager
 - hwclock
 - dracut
-- 
cgit v1.2.3