initscripts: make DISTRO_FEATURE safe

The initscripts bbappend should only activate when virtualization is
in distro features.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 17 insertions, 15 deletions

diff --git a/recipes-core/initscripts/initscripts_1.%.bbappend b/recipes-core/initscripts/initscripts_1.%.bbappend
index 0600ab2a..96b4ac57 100644
--- a/recipes-core/initscripts/initscripts_1.%.bbappend
+++ b/recipes-core/initscripts/initscripts_1.%.bbappend
@@ -1,16 +1,2 @@
-do_install_append() {
+require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)}
 
-        echo                  >> ${D}${sysconfdir}/init.d/functions
-        echo success \(\) \{  >> ${D}${sysconfdir}/init.d/functions
-        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
-        echo \}               >> ${D}${sysconfdir}/init.d/functions
-        echo failure \(\) \{  >> ${D}${sysconfdir}/init.d/functions
-        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
-        echo \}               >> ${D}${sysconfdir}/init.d/functions
-        echo warning \(\) \{  >> ${D}${sysconfdir}/init.d/functions
-        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
-        echo \}               >> ${D}${sysconfdir}/init.d/functions
-        echo begin \(\) \{  >> ${D}${sysconfdir}/init.d/functions
-        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
-        echo \}               >> ${D}${sysconfdir}/init.d/functions
-}
diff --git a/recipes-core/initscripts/initscripts_virtualization.inc b/recipes-core/initscripts/initscripts_virtualization.inc
new file mode 100644
index 00000000..0600ab2a
--- /dev/null
+++ b/recipes-core/initscripts/initscripts_virtualization.inc
@@ -0,0 +1,16 @@
+do_install_append() {
+
+        echo                  >> ${D}${sysconfdir}/init.d/functions
+        echo success \(\) \{  >> ${D}${sysconfdir}/init.d/functions
+        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
+        echo \}               >> ${D}${sysconfdir}/init.d/functions
+        echo failure \(\) \{  >> ${D}${sysconfdir}/init.d/functions
+        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
+        echo \}               >> ${D}${sysconfdir}/init.d/functions
+        echo warning \(\) \{  >> ${D}${sysconfdir}/init.d/functions
+        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
+        echo \}               >> ${D}${sysconfdir}/init.d/functions
+        echo begin \(\) \{  >> ${D}${sysconfdir}/init.d/functions
+        echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions
+        echo \}               >> ${D}${sysconfdir}/init.d/functions
+}