summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMartin Donnelly <martin.donnelly@ge.com>2013-01-19 22:47:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-20 12:58:56 +0000
commit20dc0a5b9ba86fd56dc99a6dbf147cbb15cf33c3 (patch)
treee46067b8a0949ebeb4ded332324aca2560ba8123 /meta/recipes-core
parentb94227f7290796f6ebbe5c5ff1680b9b689022b1 (diff)
downloadpoky-20dc0a5b9ba86fd56dc99a6dbf147cbb15cf33c3.tar.gz
base-files: add fstab for systemd based systems
The default fstab has entries which are not necessary in systemd based systems so add a simpler default in this case. (From OE-Core rev: 77bbb839ba25b974a538b90d346b454ccd5deefd) Signed-off-by: Martin Donnelly <martin.donnelly@ge.com> Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/base-files/base-files/fstab.systemd9
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb7
2 files changed, 15 insertions, 1 deletions
diff --git a/meta/recipes-core/base-files/base-files/fstab.systemd b/meta/recipes-core/base-files/base-files/fstab.systemd
new file mode 100644
index 0000000000..cb48a0de4a
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/fstab.systemd
@@ -0,0 +1,9 @@
1# stock fstab - you probably want to override this with a machine specific one
2
3rootfs / auto defaults 1 1
4tmpfs /var/volatile tmpfs defaults 0 0
5tmpfs /media/ram tmpfs defaults 0 0
6
7# uncomment this if your device has a SD/MMC/Transflash slot
8#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
9
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 \
18 file://profile \ 18 file://profile \
19 file://shells \ 19 file://shells \
20 file://fstab \ 20 file://fstab \
21 file://fstab.systemd \
21 file://filesystems \ 22 file://filesystems \
22 file://issue.net \ 23 file://issue.net \
23 file://issue \ 24 file://issue \
@@ -91,7 +92,11 @@ do_install () {
91 install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation 92 install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation
92 fi 93 fi
93 94
94 install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab 95 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
96 install -m 0644 ${WORKDIR}/fstab.systemd ${D}${sysconfdir}/fstab
97 else
98 install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
99 fi
95 install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems 100 install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
96 install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd 101 install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
97 sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile 102 sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile