adjust calamares-config-redcore && calamares-runtime packages to v3.1.0 of calamares

5 files changed, 35 insertions, 3 deletions

diff --git a/app-misc/calamares-config-redcore/calamares-config-redcore-1706.ebuild b/app-misc/calamares-config-redcore/calamares-config-redcore-1706.ebuild
new file mode 100644
index 00000000..9f6639d2
--- /dev/null
+++ b/app-misc/calamares-config-redcore/calamares-config-redcore-1706.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="Redcore 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-redcore/files/modules/bootloader.conf b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
index 5798c14f..85db8995 100644
--- a/app-misc/calamares-config-redcore/files/modules/bootloader.conf
+++ b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
@@ -5,8 +5,8 @@ efiBootLoader: "grub"
 
 # systemd-boot configuration files settings, set kernel and initramfs file names
 # and amount of time before default selection boots
-kernel: "/boot/kernel-genkernel-x86_64-4.9.15-redcore"
-img: "/boot/initramfs-genkernel-x86_64-4.9.15-redcore"
+kernel: "/boot/kernel-genkernel-x86_64-4.9.30-redcore"
+img: "/boot/initramfs-genkernel-x86_64-4.9.30-redcore"
 timeout: "10"
 # Optionally set the menu entry name and kernel name to use in systemd-boot.
 # If not specified here, these settings will be taken from branding.desc.
diff --git a/app-misc/calamares-config-redcore/files/modules/machineid.conf b/app-misc/calamares-config-redcore/files/modules/machineid.conf
new file mode 100644
index 00000000..341caf7e
--- /dev/null
+++ b/app-misc/calamares-config-redcore/files/modules/machineid.conf
@@ -0,0 +1,8 @@
+---
+# Whether to create /etc/machine-id for systemd.
+systemd: false
+# Whether to create /var/lib/dbus/machine-id for D-Bus.
+dbus: true
+# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
+# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+symlink: true
diff --git a/app-misc/calamares-config-redcore/files/modules/users.conf b/app-misc/calamares-config-redcore/files/modules/users.conf
index 048a3d75..6c220e27 100644
--- a/app-misc/calamares-config-redcore/files/modules/users.conf
+++ b/app-misc/calamares-config-redcore/files/modules/users.conf
@@ -1,5 +1,4 @@
 ---
-userGroup:       users
 defaultGroups:
     - lp
     - video
diff --git a/app-misc/calamares-config-redcore/files/modules/welcome.conf b/app-misc/calamares-config-redcore/files/modules/welcome.conf
index 7e4f3404..d7940420 100644
--- a/app-misc/calamares-config-redcore/files/modules/welcome.conf
+++ b/app-misc/calamares-config-redcore/files/modules/welcome.conf
@@ -6,6 +6,7 @@ showReleaseNotesUrl:    true
 requirements:
     requiredStorage:    10.0
     requiredRam:        1.0
+    internetCheckUrl:   http://google.com
     check:
         - storage
         - ram