Commit 605a5060 authored by Lennart Poettering's avatar Lennart Poettering Committed by Tollef Fog Heen
Browse files

units: don't mount tmpfs on /media anymore

udisks2 doesn't use /media anymore, instead mounts removable media in a
user-private directory beneath /run. /media is hence mostly obsolete and
hence it makes little sense to continue to mount a tmpfs to it.

Distributions should consider dropping the mount point entirely since
nothing uses it anymore.

Conflicts:

	TODO
parent 8c555a42
......@@ -294,7 +294,6 @@ dist_systemunit_DATA = \
units/sys-kernel-security.mount \
units/sys-fs-fuse-connections.mount \
units/var-run.mount \
units/media.mount \
units/remount-rootfs.service \
units/printer.target \
units/sound.target \
......@@ -2306,13 +2305,11 @@ systemd-install-data-hook:
rm -f systemd-remount-api-vfs.service \
fsck-root.service \
remount-rootfs.service \
var-run.mount \
media.mount && \
var-run.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) ../media.mount media.mount )
$(LN_S) ../var-run.mount var-run.mount )
( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
......
......@@ -18,6 +18,8 @@ Bugfixes:
Features:
* dbus upstream still refers to dbus.target and shouldn't
* journald: make configurable "store-on-var", "store-on-run", "dont-store", "auto"
(store-persistent, store-volatile?)
......
# 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment