1 files changed, 6 insertions, 1 deletions

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 8ef71958b0..a90e995932 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -18,6 +18,7 @@ SRC_URI = "file://rotation \
            file://profile \
            file://shells \
            file://fstab \
+           file://fstab.systemd \
            file://filesystems \
            file://issue.net \
            file://issue \
@@ -91,7 +92,11 @@ do_install () {
                 install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation
         fi
 
-        install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
+        if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+                install -m 0644 ${WORKDIR}/fstab.systemd ${D}${sysconfdir}/fstab
+        else
+                install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
+        fi
         install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
         install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
         sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile