[systemd-commits] 3 commits - TODO man/systemd.mount.xml units/dev-hugepages.mount units/dev-mqueue.mount units/proc-sys-fs-binfmt_misc.automount units/proc-sys-fs-binfmt_misc.mount units/sys-fs-fuse-connections.mount units/sys-kernel-config.mount units/sys-kernel-debug.mount units/tmp.mount
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Jan 15 09:14:22 PST 2013
TODO | 2 ++
man/systemd.mount.xml | 12 ++++++++++--
units/dev-hugepages.mount | 1 +
units/dev-mqueue.mount | 1 +
units/proc-sys-fs-binfmt_misc.automount | 1 +
units/proc-sys-fs-binfmt_misc.mount | 1 +
units/sys-fs-fuse-connections.mount | 1 +
units/sys-kernel-config.mount | 1 +
units/sys-kernel-debug.mount | 1 +
units/tmp.mount | 1 +
10 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 25ed795892f309feecf048d4b5e66e5447b9c4ad
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jan 15 18:13:34 2013 +0100
units: add reference to new wiki page to all api mount units
diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount
index 9381167..d711fae 100644
--- a/units/dev-hugepages.mount
+++ b/units/dev-hugepages.mount
@@ -8,6 +8,7 @@
[Unit]
Description=Huge Pages File System
Documentation=https://www.kernel.org/doc/Documentation/vm/hugetlbpage.txt
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
Before=sysinit.target
ConditionPathExists=/sys/kernel/mm/hugepages
diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount
index 5786bb1..5c11ca7 100644
--- a/units/dev-mqueue.mount
+++ b/units/dev-mqueue.mount
@@ -8,6 +8,7 @@
[Unit]
Description=POSIX Message Queue File System
Documentation=man:mq_overview(7)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
Before=sysinit.target
ConditionPathExists=/proc/sys/fs/mqueue
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 7fd5afe..6be3893 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -8,6 +8,7 @@
[Unit]
Description=Arbitrary Executable File Formats File System Automount Point
Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
Before=sysinit.target
ConditionPathExists=/proc/sys/fs/binfmt_misc/
diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount
index c64c849..8c7c386 100644
--- a/units/proc-sys-fs-binfmt_misc.mount
+++ b/units/proc-sys-fs-binfmt_misc.mount
@@ -8,6 +8,7 @@
[Unit]
Description=Arbitrary Executable File Formats File System
Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
[Mount]
diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount
index 9269ea4..ebd93e2 100644
--- a/units/sys-fs-fuse-connections.mount
+++ b/units/sys-fs-fuse-connections.mount
@@ -8,6 +8,7 @@
[Unit]
Description=FUSE Control File System
Documentation=https://www.kernel.org/doc/Documentation/filesystems/fuse.txt
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
ConditionPathExists=/sys/fs/fuse/connections
After=systemd-modules-load.service
diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
index e7cd490..020101c 100644
--- a/units/sys-kernel-config.mount
+++ b/units/sys-kernel-config.mount
@@ -8,6 +8,7 @@
[Unit]
Description=Configuration File System
Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/configfs.txt
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
ConditionPathExists=/sys/kernel/config
After=systemd-modules-load.service
diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount
index 8b1e33e..5369728 100644
--- a/units/sys-kernel-debug.mount
+++ b/units/sys-kernel-debug.mount
@@ -8,6 +8,7 @@
[Unit]
Description=Debug File System
Documentation=https://www.kernel.org/doc/Documentation/filesystems/debugfs.txt
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
ConditionPathExists=/sys/kernel/debug
Before=sysinit.target
diff --git a/units/tmp.mount b/units/tmp.mount
index 94c41c2..99a3ba3 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -8,6 +8,7 @@
[Unit]
Description=Temporary Directory
Documentation=man:hier(7)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
Conflicts=umount.target
Before=local-fs.target umount.target
commit 728075eea89dc20067d900bb086d3515e37caab0
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jan 15 18:13:15 2013 +0100
update TODO
diff --git a/TODO b/TODO
index d3d4699..4704604 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,8 @@ F18:
Features:
+* refuse instantiation of proc.mount and mount units for all other API fs
+
* "systemctl disable" on a static unit prints no message and does
nothing. "systemctl enable" does nothing, and gives a bad message
about it. Should fix both to print nice actionable messages.
commit c32247e9d7c4231d4f731c9103d90b4e2e1682a2
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jan 15 18:10:11 2013 +0100
man: correct order of precedence for fstab units
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 2dc095e..7f879db 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -153,8 +153,16 @@
<literal>h</literal>, <literal>ms</literal>.</para>
<para>If a mount point is configured in both
- <filename>/etc/fstab</filename> and a unit file, the
- configuration in the latter takes precedence.</para>
+ <filename>/etc/fstab</filename> and a unit file that
+ is stored below <filename>/usr</filename> the former
+ will take precedence. If the unit file is stored below
+ <filename>/etc</filename> it will take
+ precedence. This means: native unit files take
+ precedence over traditional configuration files, but
+ this is superseded by the rule that configuration in
+ <filename>/etc</filename> will always take precedence
+ over configuration in
+ <filename>/usr</filename>.</para>
</refsect1>
<refsect1>
More information about the systemd-commits
mailing list