diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-03-27 17:04:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-03-27 17:04:22 +0200 |
| commit | 231931ffba1bca9d8759bbd6f797e56f8c6971fa (patch) | |
| tree | afb048b0f4768c100ce2b9435e428f1d2dd3d8a7 | |
| parent | d508ac0ba0c43efa8caacdd8050970efb1e30243 (diff) | |
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.
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | units/media.mount | 16 |
3 files changed, 4 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index abe21506df..0fa38d8ccb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -290,7 +290,6 @@ dist_systemunit_DATA = \ units/sys-kernel-debug.mount \ units/sys-fs-fuse-connections.mount \ units/var-run.mount \ - units/media.mount \ units/remount-rootfs.service \ units/printer.target \ units/sound.target \ @@ -2283,13 +2282,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 + * Make -f in systemctl enable both --follow and --force * ensure that logind sets the syslog facility to AUTH when logging diff --git a/units/media.mount b/units/media.mount deleted file mode 100644 index 66a5a5ca2a..0000000000 --- a/units/media.mount +++ /dev/null @@ -1,16 +0,0 @@ -# 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 |