All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ross Burton <ross.burton@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/10] base-files: add fstab for systemd based systems
Date: Sat, 19 Jan 2013 22:47:11 +0000	[thread overview]
Message-ID: <6dc13da20db32190722df18348662e055c237a73.1358635193.git.ross.burton@intel.com> (raw)
In-Reply-To: <cover.1358635193.git.ross.burton@intel.com>
In-Reply-To: <cover.1358635193.git.ross.burton@intel.com>

From: Martin Donnelly <martin.donnelly@ge.com>

The default fstab has entries which are not necessary
in systemd based systems so add a simpler default in
this case.

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>
---
 meta/recipes-core/base-files/base-files/fstab.systemd |    9 +++++++++
 meta/recipes-core/base-files/base-files_3.0.14.bb     |    7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/base-files/base-files/fstab.systemd

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 0000000..cb48a0d
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/fstab.systemd
@@ -0,0 +1,9 @@
+# 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
+
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 8ef7195..a90e995 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
-- 
1.7.10.4




  parent reply	other threads:[~2013-01-19 23:04 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-19 22:47 [PATCH 00/10] Initial systemd integration Ross Burton
2013-01-19 22:47 ` [PATCH 01/10] default-distrovars: Add DISTRO_FEATURES_INITMAN to DISTRO_FEATURES Ross Burton
2013-01-23 11:38   ` [PATCH] bitbake.conf: unbreak all builds with custom DISTRO_FEATURES Marcin Juszkiewicz
2013-01-23 11:43     ` Burton, Ross
2013-01-23 11:47       ` Marcin Juszkiewicz
2013-01-19 22:47 ` [PATCH 02/10] default-providers: Automatically set PREFERRED_PROVIDER_udev Ross Burton
2013-01-20 23:12   ` Martin Jansa
2013-01-20 23:15     ` Martin Jansa
2013-01-19 22:47 ` [PATCH 03/10] dbus: respect systemd distro feature Ross Burton
2013-01-19 22:47 ` [PATCH 04/10] systemd: add systemd recipes Ross Burton
2013-01-20 23:11   ` Martin Jansa
2013-01-21 12:07     ` Burton, Ross
2013-01-19 22:47 ` [PATCH 05/10] default-providers: Add systemd option to PREFERRED_PROVIDER_udev Ross Burton
2013-01-19 22:47 ` [PATCH 06/10] packagegroup-core-boot: install systemd-compat-units on systemd images Ross Burton
2013-01-19 22:47 ` [PATCH 07/10] update-rc.d: disable update-rc.d.bbclass when systemd enabled Ross Burton
2013-01-19 22:47 ` Ross Burton [this message]
2013-01-19 22:47 ` [PATCH 09/10] packagegroup-core-boot: only install initscripts if we're using sysvinit Ross Burton
2013-01-19 22:47 ` [PATCH 10/10] libpam: register PAM session with logind Ross Burton
2013-01-20 18:34 ` [PATCH 00/10] Initial systemd integration Saul Wold
2013-01-20 20:21   ` Burton, Ross
2013-01-21  8:59     ` Martin Jansa
2013-01-21  9:21       ` Burton, Ross
2013-01-21  3:57   ` Saul Wold
2013-01-21  8:08     ` Burton, Ross
2013-01-21  8:19       ` Eric Bénard
2013-01-21  8:47         ` Radu Moisan
2013-01-21 10:14         ` Richard Purdie
2013-01-21 12:09           ` Burton, Ross
2013-01-21 12:10     ` Burton, Ross
2013-01-21  3:30 ` Ciprian Ciubotariu
2013-01-21 12:12   ` Burton, Ross
2013-01-21 16:57     ` Saul Wold
2013-01-21 17:00       ` Burton, Ross
2013-01-22 22:04     ` Ciprian Ciubotariu
2013-01-22 22:29       ` Richard Purdie
2013-01-22  9:30 ` ChenQi
2013-01-22 10:48   ` Radu Moisan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6dc13da20db32190722df18348662e055c237a73.1358635193.git.ross.burton@intel.com \
    --to=ross.burton@intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.