improve baselayout to autoinclude a blacklist.conf by default

3 files changed, 23 insertions, 18 deletions

diff --git a/sys-apps/baselayout/baselayout-2.2-r3.ebuild b/sys-apps/baselayout/baselayout-2.2-r4.ebuild
index 17497bbc..aec48add 100644
--- a/sys-apps/baselayout/baselayout-2.2-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.2-r4.ebuild
@@ -156,8 +156,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	# Set Kogaion output here
-	epatch "${FILESDIR}/${PN}-kogaion-os-release.patch"
+	epatch "${FILESDIR}/${PN}-redcore.patch"
 }
 
 src_install() {
diff --git a/sys-apps/baselayout/files/baselayout-kogaion-os-release.patch b/sys-apps/baselayout/files/baselayout-kogaion-os-release.patch
deleted file mode 100644
index 1f11f490..00000000
--- a/sys-apps/baselayout/files/baselayout-kogaion-os-release.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- baselayout-2.2.orig/etc.Linux/os-release
-+++ baselayout-2.2/etc.Linux/os-release
-@@ -1,7 +1,7 @@
--NAME=Gentoo
--ID=gentoo
--PRETTY_NAME="Gentoo/Linux"
-+NAME=Kogaion
-+ID=kogaion
-+PRETTY_NAME="Kogaion/Linux"
- ANSI_COLOR="1;32"
--HOME_URL="http://www.gentoo.org/"
--SUPPORT_URL="http://www.gentoo.org/main/en/support.xml"
--BUG_REPORT_URL="https://bugs.gentoo.org/"
-+HOME_URL="http://www.rogentos.ro/"
-+SUPPORT_URL="http://forum.rogentos.ro/"
-+BUG_REPORT_URL="https://bugs.rogentos.ro/"
diff --git a/sys-apps/baselayout/files/baselayout-redcore.patch b/sys-apps/baselayout/files/baselayout-redcore.patch
new file mode 100644
index 00000000..f6334a32
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-redcore.patch
@@ -0,0 +1,22 @@
+diff -Nur a/etc.Linux/modprobe.d/blacklist.conf b/etc.Linux/modprobe.d/blacklist.conf
+--- a/etc.Linux/modprobe.d/blacklist.conf	1970-01-01 01:00:00.000000000 +0100
++++ b/etc.Linux/modprobe.d/blacklist.conf	2016-11-06 15:09:49.930439684 +0000
+@@ -0,0 +1 @@
++blacklist vboxvideo
+diff -Nur a/etc.Linux/os-release b/etc.Linux/os-release
+--- a/etc.Linux/os-release	2012-05-17 05:21:08.000000000 +0100
++++ b/etc.Linux/os-release	2016-11-06 15:08:06.375432952 +0000
+@@ -1,7 +1,7 @@
+-NAME=Gentoo
+-ID=gentoo
+-PRETTY_NAME="Gentoo/Linux"
++NAME=Redcore
++ID=redcore
++PRETTY_NAME="Redcore/Linux"
+ ANSI_COLOR="1;32"
+-HOME_URL="http://www.gentoo.org/"
+-SUPPORT_URL="http://www.gentoo.org/main/en/support.xml"
+-BUG_REPORT_URL="https://bugs.gentoo.org/"
++HOME_URL="http://redcorelinux.org"
++SUPPORT_URL="http://redcorelinux.org"
++BUG_REPORT_URL="http://redcorelinux.org"