From b4efdf97203ddf781c17f77be84cc61516a077d2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 29 Jun 2012 16:14:01 +0200
Subject: [PATCH 1/1] remount-fs: also remount /usr according to fstab

---
 TODO                               |  9 +++++++++
 man/systemd-remount-fs.service.xml | 29 +++++++++++++++--------------
 src/core/dbus-manager.c            |  4 +++-
 src/remount-fs/remount-fs.c        |  5 +++--
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/TODO b/TODO
index 01b5edcd2..c51bfbe70 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,15 @@ Bugfixes:
 
 Features:
 
+* document that journal data is primarily ASCII, UTF-8 where necessary and binary only where nothing else makes sense.
+
+* on reload/reexec: serialize NInstalledJobs properly
+
+* Document:
+        - PID 1 D-Bus API
+        - Update Syslog Interface docs
+        - Journal C API manual pages
+
 * logind: export a bool property that tells user whether a
   suspend/shutdown is currently scheduled, i.e. where are between
   PrepareForSuspend(true) and PrepareForSuspend(false)
diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index fa3b00967..c1df5e6f4 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -58,20 +58,21 @@
                 is an early-boot service that applies mount options
                 listed in
                 <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                to the root file system and the kernel API virtual
-                file systems. This is required so that the mount
-                options of these file systems -- which are pre-mounted
-                by the kernel, the initial RAM disk or system manager
-                code -- are updated to those listed in
-                <filename>/etc/fstab</filename>. This service ignores
-                normal file systems and only changes the root file
-                system (i.e. <filename>/</filename>) and the virtual
-                kernel API file systems such as
-                <filename>/proc</filename>, <filename>/sys</filename>
-                or <filename>/dev/</filename>. This service executes
-                no operation if <filename>/etc/fstab</filename> does
-                not exist or lists no entries for the root file system
-                or the kernel API VFS.</para>
+                to the root file system, the <filename>/usr</filename>
+                file system and the kernel API virtual file
+                systems. This is required so that the mount options of
+                these file systems -- which are pre-mounted by the
+                kernel, the initial RAM disk, container environments
+                or system manager code -- are updated to those listed
+                in <filename>/etc/fstab</filename>. This service
+                ignores normal file systems and only changes the root
+                file system (i.e. <filename>/</filename>),
+                <filename>/usr</filename> and the virtual kernel API
+                file systems such as <filename>/proc</filename>,
+                <filename>/sys</filename> or
+                <filename>/dev/</filename>. This service executes no
+                operation if <filename>/etc/fstab</filename> does not
+                exist or lists no entries for the mentioned file systems.</para>
         </refsect1>
 
         <refsect1>
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index cd827ca45..f8a540005 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -114,7 +114,9 @@
         "  </method>\n"                                                 \
         "  <method name=\"Subscribe\"/>\n"                              \
         "  <method name=\"Unsubscribe\"/>\n"                            \
-        "  <method name=\"Dump\"/>\n"                                   \
+        "  <method name=\"Dump\">\n"                                    \
+        "   <arg name=\"dump\" type=\"s\" direction=\"out\"/>\n"        \
+        "  </method>\n"                                                 \
         "  <method name=\"CreateSnapshot\">\n"                          \
         "   <arg name=\"name\" type=\"s\" direction=\"in\"/>\n"         \
         "   <arg name=\"cleanup\" type=\"b\" direction=\"in\"/>\n"      \
diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index ef68e506e..8b3aaeb32 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -79,9 +79,10 @@ int main(int argc, char *argv[]) {
                 int k;
                 char *s;
 
-                /* Remount the root fs and all API VFS */
+                /* Remount the root fs, /usr and all API VFS */
                 if (!mount_point_is_api(me->mnt_dir) &&
-                    !path_equal(me->mnt_dir, "/"))
+                    !path_equal(me->mnt_dir, "/") &&
+                    !path_equal(me->mnt_dir, "/usr"))
                         continue;
 
                 log_debug("Remounting %s", me->mnt_dir);
-- 
2.30.2