sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Revert "base-files: add fstab for systemd based systems" 

For hybrid systemd/sysvinit builds, only one fstab can be used.
The default fstab used by sysvinit should work fine with systemd.

Since virtually every machine will ship its own fstab in its bsp
layer, the bsp layer may decide how to override the fstab based
on distro features.

This reverts commit 77bbb839ba25b974a538b90d346b454ccd5deefd.

(From OE-Core rev: e9352e8a43639564af0a97f5e8a642e0989b0256)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Oberritter 2013-03-19 22:54:26 +01:00 committed by Richard Purdie
parent f2165d28c3
commit aaaafafceb
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-core/base-files/base-files/fstab.systemd
View File

@ -1,9 +0,0 @@
# stock fstab - you probably want to override this with a machine specific one
rootfs / auto defaults 1 1
tmpfs /var/volatile tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
# uncomment this if your device has a SD/MMC/Transflash slot
#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0

7
meta/recipes-core/base-files/base-files_3.0.14.bb
View File

@ -18,7 +18,6 @@ SRC_URI = "file://rotation \
file://profile \
file://shells \
file://fstab \
file://fstab.systemd \
file://filesystems \
file://issue.net \
file://issue \
@ -92,11 +91,7 @@ do_install () {
install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation
fi
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}/fstab ${D}${sysconfdir}/fstab
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