Fri Nov 19 07:26:38 PST 2010

man/tmpfiles.d.xml                         |   44 ++++++++++++++---------------
 src/fsck.c                                 |    3 +
 units/dev-hugepages.automount              |    2 -
 units/dev-mqueue.automount                 |    2 -
 units/fedora/plymouth-read-write.service   |    2 -
 units/hwclock-load.service                 |    4 +-
 units/proc-sys-fs-binfmt_misc.automount    |    2 -
 units/sys-kernel-debug.automount           |    2 -
 units/sys-kernel-security.automount        |    2 -
 units/systemd-modules-load.service.in      |    2 -
 units/systemd-random-seed-load.service.in  |    2 -
 units/systemd-readahead-collect.service.in |    2 -
 units/systemd-readahead-replay.service.in  |    2 -
 units/systemd-sysctl.service.in            |    2 -
 units/systemd-tmpfiles-clean.service.in    |    2 -
 units/systemd-tmpfiles-setup.service.in    |    2 -
 units/systemd-vconsole-setup.service.in    |    2 -
 17 files changed, 40 insertions(+), 39 deletions(-)

New commits:
commit e096bf2f95c1cb553bb6f3ea370d450397e441e6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Nov 19 16:24:21 2010 +0100

    units: move a couple of units from base.target to sysinit.target

diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
index b9dae85..dfd3868 100644
--- a/units/dev-hugepages.automount
+++ b/units/dev-hugepages.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Huge Pages File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/dev/hugepages
diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
index acdb542..73c4110 100644
--- a/units/dev-mqueue.automount
+++ b/units/dev-mqueue.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=POSIX Message Queue File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/dev/mqueue
diff --git a/units/fedora/plymouth-read-write.service b/units/fedora/plymouth-read-write.service
index ff2f8e4..09fbf7d 100644
--- a/units/fedora/plymouth-read-write.service
+++ b/units/fedora/plymouth-read-write.service
@@ -9,7 +9,7 @@
 Description=Tell Plymouth To Write Out Runtime Data
 DefaultDependencies=no
 After=local-fs.target
-Before=basic.target
+Before=sysinit.target
 
 [Service]
 ExecStart=-/bin/plymouth update-root-fs --read-write
diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 6a1951a..4deb5c1 100644
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -10,7 +10,7 @@ Description=Apply System Clock UTC Offset
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target udev.service
+Before=sysinit.target shutdown.target udev.service
 
 [Service]
 Type=oneshot
@@ -30,4 +30,4 @@ StandardOutput=syslog
 # system time as part of kernel setup.
 
 [Install]
-WantedBy=basic.target
+WantedBy=sysinit.target
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index f9b5cc7..91f49ef 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Arbitrary Executable File Formats File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/proc/sys/fs/binfmt_misc
diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount
index 7b3e041..f856a87 100644
--- a/units/sys-kernel-debug.automount
+++ b/units/sys-kernel-debug.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Debug File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/sys/kernel/debug
diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
index c43deb7..cd13e4a 100644
--- a/units/sys-kernel-security.automount
+++ b/units/sys-kernel-security.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Security File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/sys/kernel/security
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 612338b..739729e 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -10,7 +10,7 @@ Description=Load Kernel Modules
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionDirectoryNotEmpty=/etc/modules-load.d
 
 [Service]
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 8e54db9..a2b6a55 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -11,7 +11,7 @@ DefaultDependencies=no
 Wants=local-fs.target
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
index bcea65e..1a66f9f 100644
--- a/units/systemd-readahead-collect.service.in
+++ b/units/systemd-readahead-collect.service.in
@@ -10,7 +10,7 @@ Description=Collect Read-Ahead Data
 DefaultDependencies=no
 Wants=systemd-readahead-done.timer
 Conflicts=shutdown.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 
 [Service]
 Type=notify
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
index 8ed3b75..5cc6def 100644
--- a/units/systemd-readahead-replay.service.in
+++ b/units/systemd-readahead-replay.service.in
@@ -9,7 +9,7 @@
 Description=Replay Read-Ahead Data
 DefaultDependencies=no
 Conflicts=shutdown.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/.readahead
 
 [Service]
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index af3ba88..ada4478 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -10,7 +10,7 @@ Description=Apply Kernel Variables
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/etc/sysctl.conf
 ConditionDirectoryNotEmpty=/etc/sysctl.d
 
diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in
index 3b27330..9d05135 100644
--- a/units/systemd-tmpfiles-clean.service.in
+++ b/units/systemd-tmpfiles-clean.service.in
@@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/etc/tmpfiles.d
 
 [Service]
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
index df80e82..d9274ed 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -10,7 +10,7 @@ Description=Recreate Volatile Files and Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/etc/tmpfiles.d
 
 [Service]
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 19760a9..91d95d6 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -10,7 +10,7 @@ Description=Setup Virtual Console
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 
 [Service]
 Type=oneshot

commit 88aebb62656b4d5bac96cf2e5a5c85ee409d81a7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Nov 19 16:14:52 2010 +0100

    man: reorder things to follow the same order everywhere

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 9a74991..7bdb6de 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -65,30 +65,11 @@
 		containing action, mode, ownership and age
 		fields:</para>
 
-                <programlisting>type path          mode uid  gid  age
+                <programlisting>Type Path          Mode UID  GID  Age
 d    /var/run/user 0755 root root 10d</programlisting>
 
                 <refsect2>
-                        <title>mode</title>
-
-                        <para>The file access mode to use for this
-                        file or directory. If ommited or when set to -
-                        the default is used: 0755 for directories,
-                        0644 for files.</para>
-                </refsect2>
-
-                <refsect2>
-                        <title>uid, gid</title>
-
-                        <para>The user and group to use for this file
-                        or directory. This may either be a numeric
-                        user/group ID or a user or group name. If
-                        ommited or when set to - the default 0 is
-                        used.</para>
-                </refsect2>
-
-                <refsect2>
-                        <title>type</title>
+                        <title>Type</title>
                         <variablelist>
                                 <varlistentry>
                                         <term><varname>f</varname></term>
@@ -128,7 +109,26 @@ d    /var/run/user 0755 root root 10d</programlisting>
                 </refsect2>
 
                 <refsect2>
-                        <title>age</title>
+                        <title>Mode</title>
+
+                        <para>The file access mode to use for this
+                        file or directory. If ommited or when set to -
+                        the default is used: 0755 for directories,
+                        0644 for files.</para>
+                </refsect2>
+
+                <refsect2>
+                        <title>UID, GID</title>
+
+                        <para>The user and group to use for this file
+                        or directory. This may either be a numeric
+                        user/group ID or a user or group name. If
+                        ommited or when set to - the default 0 is
+                        used.</para>
+                </refsect2>
+
+                <refsect2>
+                        <title>Age</title>
                         <para>The date field, when set, is used to
                         decide what files to delete when cleaning. If
                         a file or directory is older than the current

commit e9ecea880571e520c60fae2dd2f10fcfd7dd1ab8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Nov 19 04:22:36 2010 +0100

    Revert "Revert "fsck: add new -l switch to fsck mount options""
    
    This reverts commit c8bc83f5eac49f083ae53d965577118c1b5c1116.
    
    As Karel pointed out the -l switch doesn't actualy conflict with
    per-filesystem options, since those can be seperated by -- in the
    command line. Since -l is here to stay we hence enable it again for now.

diff --git a/src/fsck.c b/src/fsck.c
index dfaf221..fdcf6b4 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -142,7 +142,7 @@ static void test_files(void) {
 }
 
 int main(int argc, char *argv[]) {
-        const char *cmdline[7];
+        const char *cmdline[8];
         int i = 0, r = EXIT_FAILURE, q;
         pid_t pid;
         siginfo_t status;
@@ -213,6 +213,7 @@ int main(int argc, char *argv[]) {
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] = "-a";
         cmdline[i++] = "-T";
+        cmdline[i++] = "-l";
 
         if (!root_directory)
                 cmdline[i++] = "-M";

