[systemd-commits] 2 commits - Makefile.am src/99-systemd.rules.in TODO units/sys-fs-fuse-connections.mount

Lennart Poettering lennart at kemper.freedesktop.org
Wed Sep 21 18:02:25 PDT 2011


 Makefile.am                         |    3 +++
 TODO                                |    4 ++++
 src/99-systemd.rules.in             |    9 +++++++++
 units/sys-fs-fuse-connections.mount |   18 ++++++++++++++++++
 4 files changed, 34 insertions(+)

New commits:
commit a65f4aeb630a6aee67eee67ac0f6301b52fd904b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Sep 22 03:02:15 2011 +0200

    udev: asynchronously mount fuse/confifgs as soon as the kmods are loaded

diff --git a/src/99-systemd.rules.in b/src/99-systemd.rules.in
index 884a614..b2481ae 100644
--- a/src/99-systemd.rules.in
+++ b/src/99-systemd.rules.in
@@ -17,6 +17,7 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=
 
 # Ignore encrypted devices with no identified superblock on it, since
 # we are probably still calling mke2fs or mkswap on it.
+
 SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
 
 # We need a hardware independent way to identify network devices. We
@@ -41,6 +42,14 @@ SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
 SUBSYSTEM=="usb", KERNEL=="lp*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
 
+# Apply sysctl variables to network devices (and only to those) as they appear.
+
 SUBSYSTEM=="net", RUN+="@rootlibexecdir@/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name"
 
+# Asynchronously mount file systems implemented by these modules as
+# soon as they are loaded.
+
+SUBSYSTEM=="module", KERNEL=="fuse", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="sys-fs-fuse-connections.mount"
+SUBSYSTEM=="module", KERNEL=="configfs", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}="sys-kernel-config.mount"
+
 LABEL="systemd_end"

commit 7ef5875d142f01ab4fe8d35412d48c10723ae2d4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Sep 22 03:00:04 2011 +0200

    units: introduce unit file for FUSE fs
    
    FUSE and configfs is very very similar, so handle both the same way.

diff --git a/Makefile.am b/Makefile.am
index 3e102a4..6f90e9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -362,6 +362,7 @@ dist_systemunit_DATA = \
 	units/sys-kernel-config.mount \
 	units/sys-kernel-debug.mount \
 	units/sys-kernel-security.mount \
+	units/sys-fs-fuse-connections.mount \
 	units/var-run.mount \
 	units/media.mount \
 	units/remount-rootfs.service \
@@ -1840,6 +1841,7 @@ endif
                         sys-kernel-config.mount \
 			sys-kernel-debug.mount \
 			sys-kernel-security.mount \
+			sys-fs-fuse-connections.mount \
 			systemd-vconsole-setup.service \
 			systemd-modules-load.service \
 			systemd-random-seed-load.service \
@@ -1853,6 +1855,7 @@ endif
                 $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
 		$(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
 		$(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
+		$(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
 		$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
 		$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
 		$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
diff --git a/TODO b/TODO
index 880123d..2f6358c 100644
--- a/TODO
+++ b/TODO
@@ -17,6 +17,10 @@ Bugfixes:
 
 Features:
 
+* add an option to make mounts private/shareable and so on, enable this for root by default
+
+* https://bugzilla.redhat.com/show_bug.cgi?id=727068
+
 * for socket units don't inherit global stdout setting.
 
 * internal restart counter for units (focus on auto-respawn)
diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount
new file mode 100644
index 0000000..0374715
--- /dev/null
+++ b/units/sys-fs-fuse-connections.mount
@@ -0,0 +1,18 @@
+#  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=FUSE Control File System
+DefaultDependencies=no
+ConditionPathExists=/sys/fs/fuse/connections
+After=systemd-modules-load.service
+Before=sysinit.target
+
+[Mount]
+What=fusectl
+Where=/sys/fs/fuse/connections
+Type=fusectl



More information about the systemd-commits mailing list