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

diff --git a/Makefile.am b/Makefile.am
index 079c1184a572dca51ca56268282c6dcfee1bdcb8..eb58476ed0b0cb1ed34d6582b6eab5a4046f1c06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 && \

diff --git a/TODO b/TODO
index d33ae7fd55810cecf6d8cb4e4c0deb4d5cac12a2..4bdbb93ae36f255fac5bb6fce37a6a568bb125c1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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?)
 

diff --git a/units/media.mount b/units/media.mount
deleted file mode 100644 (file)
index 66a5a5c..0000000
--- 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