summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-06-29 16:14:01 +0200
committerLennart Poettering <lennart@poettering.net>2012-06-29 16:14:43 +0200
commitb4efdf97203ddf781c17f77be84cc61516a077d2 (patch)
treee630e4ec0be6d922ea6a28cc8f40281e1856b7cb /src
parent5b6a2c5aab9893ba82acf90696f83e4d48db2b19 (diff)
remount-fs: also remount /usr according to fstab
Diffstat (limited to 'src')
-rw-r--r--src/core/dbus-manager.c4
-rw-r--r--src/remount-fs/remount-fs.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index cd827ca458..f8a5400055 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 ef68e506e5..8b3aaeb32c 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);