From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Sun, 17 Sep 2017 02:11:19 +0000 (+0100)
Subject: sys-apps/openrc: Stop adding tmpfiles.* to boot runlevel
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3697951c52f8c2fa228b04ff87137e1c6535eeaf;p=gentoo.git

sys-apps/openrc: Stop adding tmpfiles.* to boot runlevel

tmpfiles.setup and tmpfiles.dev are not part of OpenRC since version
0.23, resulting in symlinks pointing to non existing files.

See: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e0ac661419042cb39c1ccf93df2981504d1e6339
Closes: https://github.com/openrc/openrc/pull/8982

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---

diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild
index 83b1d927468a..4e2ed59e45f4 100644
--- a/sys-apps/openrc/openrc-0.34.11.ebuild
+++ b/sys-apps/openrc/openrc-0.34.11.ebuild
@@ -213,13 +213,11 @@ pkg_preinst() {
 
 	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
 		migrate_udev_mount_script
-		add_boot_init tmpfiles.setup boot
 	fi
 
 	# these were added in 0.12.
 	if ! has_version ">=sys-apps/openrc-0.12"; then
 		add_boot_init loopback
-		add_boot_init tmpfiles.dev sysinit
 
 		# ensure existing /etc/conf.d/net is not removed
 		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
diff --git a/sys-apps/openrc/openrc-0.35.5.ebuild b/sys-apps/openrc/openrc-0.35.5.ebuild
index 820ec13085b0..9247eced8206 100644
--- a/sys-apps/openrc/openrc-0.35.5.ebuild
+++ b/sys-apps/openrc/openrc-0.35.5.ebuild
@@ -221,13 +221,11 @@ pkg_preinst() {
 
 	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
 		migrate_udev_mount_script
-		add_boot_init tmpfiles.setup boot
 	fi
 
 	# these were added in 0.12.
 	if ! has_version ">=sys-apps/openrc-0.12"; then
 		add_boot_init loopback
-		add_boot_init tmpfiles.dev sysinit
 
 		# ensure existing /etc/conf.d/net is not removed
 		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
diff --git a/sys-apps/openrc/openrc-0.36.ebuild b/sys-apps/openrc/openrc-0.36.ebuild
index 18aa6cade207..7babd0045d3b 100644
--- a/sys-apps/openrc/openrc-0.36.ebuild
+++ b/sys-apps/openrc/openrc-0.36.ebuild
@@ -214,13 +214,11 @@ pkg_preinst() {
 
 	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
 		migrate_udev_mount_script
-		add_boot_init tmpfiles.setup boot
 	fi
 
 	# these were added in 0.12.
 	if ! has_version ">=sys-apps/openrc-0.12"; then
 		add_boot_init loopback
-		add_boot_init tmpfiles.dev sysinit
 
 		# ensure existing /etc/conf.d/net is not removed
 		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
diff --git a/sys-apps/openrc/openrc-0.37.ebuild b/sys-apps/openrc/openrc-0.37.ebuild
index 18aa6cade207..7babd0045d3b 100644
--- a/sys-apps/openrc/openrc-0.37.ebuild
+++ b/sys-apps/openrc/openrc-0.37.ebuild
@@ -214,13 +214,11 @@ pkg_preinst() {
 
 	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
 		migrate_udev_mount_script
-		add_boot_init tmpfiles.setup boot
 	fi
 
 	# these were added in 0.12.
 	if ! has_version ">=sys-apps/openrc-0.12"; then
 		add_boot_init loopback
-		add_boot_init tmpfiles.dev sysinit
 
 		# ensure existing /etc/conf.d/net is not removed
 		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 18aa6cade207..7babd0045d3b 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -214,13 +214,11 @@ pkg_preinst() {
 
 	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
 		migrate_udev_mount_script
-		add_boot_init tmpfiles.setup boot
 	fi
 
 	# these were added in 0.12.
 	if ! has_version ">=sys-apps/openrc-0.12"; then
 		add_boot_init loopback
-		add_boot_init tmpfiles.dev sysinit
 
 		# ensure existing /etc/conf.d/net is not removed
 		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier