diff options
author | Tollef Fog Heen <tfheen@err.no> | 2012-03-07 08:19:39 +0100 |
---|---|---|
committer | Tollef Fog Heen <tfheen@err.no> | 2012-03-07 08:19:39 +0100 |
commit | 9c188a6e6ad480a489689edf52b5d765afd053de (patch) | |
tree | d787cc57029cda4d5f3db5387cdfdcb37da246b0 | |
parent | 71ae35327db192e2e2ea7409bbbbba6ce2a667ce (diff) | |
parent | a635ce9dff975665e58c07989c002cf183640ef9 (diff) | |
download | systemd-9c188a6e6ad480a489689edf52b5d765afd053de.tar.gz |
Merge branch 'debian-units' into debian
-rw-r--r-- | src/journal/systemd-journald.conf | 2 | ||||
-rw-r--r-- | units/remote-fs.target | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/journal/systemd-journald.conf b/src/journal/systemd-journald.conf index 710b0aa941..04cb3c3c90 100644 --- a/src/journal/systemd-journald.conf +++ b/src/journal/systemd-journald.conf @@ -22,4 +22,4 @@ #ForwardToSyslog=yes #ForwardToKMsg=no #ForwardToConsole=no -#ImportKernel=yes +ImportKernel=no diff --git a/units/remote-fs.target b/units/remote-fs.target index a48f87e5dd..61920d8f04 100644 --- a/units/remote-fs.target +++ b/units/remote-fs.target @@ -9,6 +9,7 @@ [Unit] Description=Remote File Systems +After=local-fs.target [Install] WantedBy=multi-user.target |