From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 7 Mar 2011 16:38:15 +0000 (+0100)
Subject: mount: make /media a tmpfs
X-Git-Tag: v20~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c4b5a3d66fedaa872209920944800e173536f801;p=elogind.git

mount: make /media a tmpfs
---

diff --git a/Makefile.am b/Makefile.am
index 3d32df2e4..7bbdb24bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,6 +233,7 @@ dist_systemunit_DATA = \
 	units/sys-kernel-security.mount \
 	units/var-lock.mount \
 	units/var-run.mount \
+	units/media.mount \
 	units/hwclock-load.service \
 	units/hwclock-save.service \
 	units/remount-rootfs.service \
@@ -1226,12 +1227,14 @@ install-data-hook:
 			fsck-root.service \
 			remount-rootfs.service \
 			var-run.mount \
-			var-lock.mount && \
+			var-lock.mount \
+			media.mount && \
 		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
 		$(LN_S) ../fsck-root.service fsck-root.service && \
 		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
 		$(LN_S) ../var-run.mount var-run.mount && \
-		$(LN_S) ../var-lock.mount var-lock.mount )
+		$(LN_S) ../var-lock.mount var-lock.mount && \
+		$(LN_S) ../media.mount media.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
diff --git a/units/media.mount b/units/media.mount
new file mode 100644
index 000000000..66a5a5ca2
--- /dev/null
+++ b/units/media.mount
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Media Directory
+Before=local-fs.target
+
+[Mount]
+What=tmpfs
+Where=/media
+Type=tmpfs
+Options=mode=755,nosuid,nodev,noexec