[systemd-commits] 7 commits - Makefile.am src/modules-load.c TODO units/dev-hugepages.automount units/dev-hugepages.mount units/dev-mqueue.automount units/dev-mqueue.mount units/sys-kernel-config.automount units/sys-kernel-config.mount units/sys-kernel-debug.automount units/sys-kernel-debug.mount units/sys-kernel-security.automount units/sys-kernel-security.mount
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Sep 20 19:02:56 PDT 2011
Makefile.am | 25 ++++++++++---------------
TODO | 2 ++
src/modules-load.c | 1 +
units/dev-hugepages.automount | 15 ---------------
units/dev-hugepages.mount | 2 ++
units/dev-mqueue.automount | 15 ---------------
units/dev-mqueue.mount | 2 ++
units/sys-kernel-config.automount | 15 ---------------
units/sys-kernel-config.mount | 5 ++++-
units/sys-kernel-debug.automount | 15 ---------------
units/sys-kernel-debug.mount | 2 ++
units/sys-kernel-security.automount | 16 ----------------
units/sys-kernel-security.mount | 3 +++
13 files changed, 26 insertions(+), 92 deletions(-)
New commits:
commit a2f5666d06fe8233025738047115bb9e3959df3e
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Sep 21 03:56:07 2011 +0200
update TODO
diff --git a/TODO b/TODO
index fcd76cb..bb34a14 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@ Bugfixes:
Features:
+* Something is wrong with symlink handling of "autovt at .service" in "systemctl list-unit-files"
+
* introduce sd_log_open() to create a connection to the syslog bridge via sd-daemon.h
* when a bus name of a service disappears from the bus make sure to queue further activation requests
commit ac0a983ac6a47cf445ead257aa5a38b06779366e
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Sep 21 03:35:19 2011 +0200
units: drop automount unit for /dev/hugepages
Since hugetlbfs cannot be compiled as kernel module there's little point
in doing on-demand mounting via autofs for it.
diff --git a/Makefile.am b/Makefile.am
index 038e71e..3e102a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,7 +357,6 @@ dist_systemunit_DATA = \
units/systemd-stdout-syslog-bridge.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
- units/dev-hugepages.automount \
units/dev-hugepages.mount \
units/dev-mqueue.mount \
units/sys-kernel-config.mount \
@@ -1836,7 +1835,7 @@ endif
rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
- rm -f dev-hugepages.automount \
+ rm -f dev-hugepages.mount \
dev-mqueue.mount \
sys-kernel-config.mount \
sys-kernel-debug.mount \
@@ -1849,7 +1848,7 @@ endif
systemd-ask-password-console.path \
systemd-kmsg-syslogd.service \
cryptsetup.target && \
- $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
+ $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
$(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
$(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
diff --git a/TODO b/TODO
index 477f08f..fcd76cb 100644
--- a/TODO
+++ b/TODO
@@ -13,16 +13,6 @@ Bugfixes:
Features:
-* File systems:
-
- mqueue - boot GOOD
- configfs module boot (order after module load) GOOD
- securityfs - boot GOOD
- binfmt_misc module autofs GOOD
- fuse module udev GOOD
- debug - boot GOOD
- hugepages - boot
-
* introduce sd_log_open() to create a connection to the syslog bridge via sd-daemon.h
* when a bus name of a service disappears from the bus make sure to queue further activation requests
diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
deleted file mode 100644
index 6e03df3..0000000
--- a/units/dev-hugepages.automount
+++ /dev/null
@@ -1,15 +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=Huge Pages File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/sys/kernel/mm/hugepages
-
-[Automount]
-Where=/dev/hugepages
diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount
index e6014e5..72a522e 100644
--- a/units/dev-hugepages.mount
+++ b/units/dev-hugepages.mount
@@ -8,6 +8,8 @@
[Unit]
Description=Huge Pages File System
DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExists=/sys/kernel/mm/hugepages
[Mount]
What=hugetlbfs
commit 1f2c94a48782daba71dd1960b5058180e37efb2f
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Sep 21 03:29:47 2011 +0200
units: drop automount unit for /dev/mqueue
Since the mqueue support cannot be built as a module there's little
benefit in having an autofs mount point set up for this.
diff --git a/Makefile.am b/Makefile.am
index 25ebc51..038e71e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -359,7 +359,6 @@ dist_systemunit_DATA = \
units/syslog.socket \
units/dev-hugepages.automount \
units/dev-hugepages.mount \
- units/dev-mqueue.automount \
units/dev-mqueue.mount \
units/sys-kernel-config.mount \
units/sys-kernel-debug.mount \
@@ -1838,7 +1837,7 @@ endif
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f dev-hugepages.automount \
- dev-mqueue.automount \
+ dev-mqueue.mount \
sys-kernel-config.mount \
sys-kernel-debug.mount \
sys-kernel-security.mount \
@@ -1851,7 +1850,7 @@ endif
systemd-kmsg-syslogd.service \
cryptsetup.target && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
- $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
+ $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
$(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 && \
diff --git a/TODO b/TODO
index 8890360..477f08f 100644
--- a/TODO
+++ b/TODO
@@ -15,9 +15,9 @@ Features:
* File systems:
- mqueue - boot
+ mqueue - boot GOOD
configfs module boot (order after module load) GOOD
- securityfs - boot
+ securityfs - boot GOOD
binfmt_misc module autofs GOOD
fuse module udev GOOD
debug - boot GOOD
diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
deleted file mode 100644
index 1061597..0000000
--- a/units/dev-mqueue.automount
+++ /dev/null
@@ -1,15 +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=POSIX Message Queue File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/proc/sys/fs/mqueue
-
-[Automount]
-Where=/dev/mqueue
diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount
index 8519df5..cffdaf7 100644
--- a/units/dev-mqueue.mount
+++ b/units/dev-mqueue.mount
@@ -8,6 +8,8 @@
[Unit]
Description=POSIX Message Queue File System
DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExists=/proc/sys/fs/mqueue
[Mount]
What=mqueue
commit 77f81d8b3012c9b8dbfea89d6b54917d3e72a9a7
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Sep 21 03:26:37 2011 +0200
units: drop automount unit for /sys/kernel/security
Since securityfs cannot be build as module there's little value in
having an on-demand autofs mount point for it.
diff --git a/Makefile.am b/Makefile.am
index ad21f68..25ebc51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,7 +363,6 @@ dist_systemunit_DATA = \
units/dev-mqueue.mount \
units/sys-kernel-config.mount \
units/sys-kernel-debug.mount \
- units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
units/var-run.mount \
units/media.mount \
@@ -1842,7 +1841,7 @@ endif
dev-mqueue.automount \
sys-kernel-config.mount \
sys-kernel-debug.mount \
- sys-kernel-security.automount \
+ sys-kernel-security.mount \
systemd-vconsole-setup.service \
systemd-modules-load.service \
systemd-random-seed-load.service \
@@ -1855,7 +1854,7 @@ endif
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(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.automount sys-kernel-security.automount && \
+ $(LN_S) ../sys-kernel-security.mount sys-kernel-security.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/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
deleted file mode 100644
index b0fc461..0000000
--- a/units/sys-kernel-security.automount
+++ /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=Security File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/sys/kernel/security
-ConditionPathIsMountPoint=!/sys/kernel/security
-
-[Automount]
-Where=/sys/kernel/security
diff --git a/units/sys-kernel-security.mount b/units/sys-kernel-security.mount
index 770207f..f5d84a6 100644
--- a/units/sys-kernel-security.mount
+++ b/units/sys-kernel-security.mount
@@ -8,6 +8,9 @@
[Unit]
Description=Security File System
DefaultDependencies=no
+ConditionPathExists=/sys/kernel/security
+ConditionPathIsMountPoint=!/sys/kernel/security
+Before=sysinit.target
[Mount]
What=securityfs
commit e124e7a4a15f89fc6fbdf3e554a86d5a26160624
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Sep 21 03:20:28 2011 +0200
units: drop automount unit for /sys/kernel/debug
Since debugfs cannot be compiled as module there's little benefit in
having it as autofs mount point.
diff --git a/Makefile.am b/Makefile.am
index de6325d..ad21f68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -362,7 +362,6 @@ dist_systemunit_DATA = \
units/dev-mqueue.automount \
units/dev-mqueue.mount \
units/sys-kernel-config.mount \
- units/sys-kernel-debug.automount \
units/sys-kernel-debug.mount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
@@ -1842,7 +1841,7 @@ endif
rm -f dev-hugepages.automount \
dev-mqueue.automount \
sys-kernel-config.mount \
- sys-kernel-debug.automount \
+ sys-kernel-debug.mount \
sys-kernel-security.automount \
systemd-vconsole-setup.service \
systemd-modules-load.service \
@@ -1855,7 +1854,7 @@ endif
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
- $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
+ $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
diff --git a/TODO b/TODO
index 123e961..8890360 100644
--- a/TODO
+++ b/TODO
@@ -16,11 +16,11 @@ Features:
* File systems:
mqueue - boot
- configfs module boot (order after module load)
+ configfs module boot (order after module load) GOOD
securityfs - boot
- binfmt_misc module autofs
- fuse module udev
- debug - boot
+ binfmt_misc module autofs GOOD
+ fuse module udev GOOD
+ debug - boot GOOD
hugepages - boot
* introduce sd_log_open() to create a connection to the syslog bridge via sd-daemon.h
diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
index f64b1ac..d6862bf 100644
--- a/units/sys-kernel-config.mount
+++ b/units/sys-kernel-config.mount
@@ -10,6 +10,7 @@ Description=Configuration File System
DefaultDependencies=no
ConditionPathExists=/sys/kernel/config
After=systemd-modules-load.service
+Before=sysinit.target
[Mount]
What=configfs
diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount
deleted file mode 100644
index 2f2de98..0000000
--- a/units/sys-kernel-debug.automount
+++ /dev/null
@@ -1,15 +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=Debug File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/sys/kernel/debug
-
-[Automount]
-Where=/sys/kernel/debug
diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount
index 53d1072..d9fca1f 100644
--- a/units/sys-kernel-debug.mount
+++ b/units/sys-kernel-debug.mount
@@ -8,6 +8,8 @@
[Unit]
Description=Debug File System
DefaultDependencies=no
+ConditionPathExists=/sys/kernel/debug
+Before=sysinit.target
[Mount]
What=debugfs
commit 0286cc1551927ea93e22b2d451a8bedddfc9d4ea
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Sep 21 03:16:00 2011 +0200
units: drop /sys/kernel/config automount unit
The mount point directory /sys/kernel/config is only created after the
module is loaded, hence there's little value in having this an automount
unit: the runtime penalty for mounting an autofs here should be the same
as for a real mount.
diff --git a/Makefile.am b/Makefile.am
index 60fb3ff..de6325d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -361,7 +361,6 @@ dist_systemunit_DATA = \
units/dev-hugepages.mount \
units/dev-mqueue.automount \
units/dev-mqueue.mount \
- units/sys-kernel-config.automount \
units/sys-kernel-config.mount \
units/sys-kernel-debug.automount \
units/sys-kernel-debug.mount \
@@ -1842,7 +1841,7 @@ endif
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
- sys-kernel-config.automount \
+ sys-kernel-config.mount \
sys-kernel-debug.automount \
sys-kernel-security.automount \
systemd-vconsole-setup.service \
@@ -1855,7 +1854,7 @@ endif
cryptsetup.target && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
- $(LN_S) ../sys-kernel-config.automount sys-kernel-config.automount && \
+ $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
diff --git a/TODO b/TODO
index fcd76cb..123e961 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,16 @@ Bugfixes:
Features:
+* File systems:
+
+ mqueue - boot
+ configfs module boot (order after module load)
+ securityfs - boot
+ binfmt_misc module autofs
+ fuse module udev
+ debug - boot
+ hugepages - boot
+
* introduce sd_log_open() to create a connection to the syslog bridge via sd-daemon.h
* when a bus name of a service disappears from the bus make sure to queue further activation requests
diff --git a/units/sys-kernel-config.automount b/units/sys-kernel-config.automount
deleted file mode 100644
index 1b4e811..0000000
--- a/units/sys-kernel-config.automount
+++ /dev/null
@@ -1,15 +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=Config File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/sys/kernel/config
-
-[Automount]
-Where=/sys/kernel/config
diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
index a80d052..f64b1ac 100644
--- a/units/sys-kernel-config.mount
+++ b/units/sys-kernel-config.mount
@@ -6,8 +6,10 @@
# (at your option) any later version.
[Unit]
-Description=Config File System
+Description=Configuration File System
DefaultDependencies=no
+ConditionPathExists=/sys/kernel/config
+After=systemd-modules-load.service
[Mount]
What=configfs
commit c72dcc54315a5bb854849e17a34c6ad8a3f9dfaa
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Sep 21 02:57:02 2011 +0200
modules-load: filter out double modules
diff --git a/src/modules-load.c b/src/modules-load.c
index 4b3b121..17b5e0b 100644
--- a/src/modules-load.c
+++ b/src/modules-load.c
@@ -131,6 +131,7 @@ finish:
if (n_arguments > 3) {
arguments[n_arguments] = NULL;
+ strv_uniq(arguments);
execv("/sbin/modprobe", arguments);
log_error("Failed to execute /sbin/modprobe: %m");
More information about the systemd-commits
mailing list