From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 11 Apr 2011 19:10:42 +0000 (+0200)
Subject: Merge commit 'v24'
X-Git-Tag: 25-1~9^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=015f26d4fd40397c745e28527eb4f758afaaffe4;p=systemd

Merge commit 'v24'

Conflicts:
	units/remote-fs.target.m4
---

015f26d4fd40397c745e28527eb4f758afaaffe4
diff --cc units/remote-fs.target.m4
index fc1fd2be,53054b6e..c11ffbff
--- a/units/remote-fs.target.m4
+++ b/units/remote-fs.target.m4
@@@ -12,8 -12,7 +12,7 @@@ Description=Remote File System
  m4_dnl
  m4_ifdef(`FOR_SYSTEM',
  m4_dnl When running in system mode we need the network up
- Requires=network.target
 -After=network.target
 +After=network.target local-fs.target
  )m4_dnl
  
  [Install]