From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 29 Jun 2011 11:52:18 +0000 (+0200)
Subject: Merge commit 'v29'
X-Git-Tag: 29-1~17^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a169c578d55a928f60619174b542db32faeb666b;p=systemd

Merge commit 'v29'

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

a169c578d55a928f60619174b542db32faeb666b
diff --cc units/remote-fs.target
index c11ffbff,a48f87e5..61920d8f
--- a/units/remote-fs.target
+++ b/units/remote-fs.target
@@@ -9,11 -9,6 +9,7 @@@
  
  [Unit]
  Description=Remote File Systems
- m4_dnl
- m4_ifdef(`FOR_SYSTEM',
- m4_dnl When running in system mode we need the network up
- After=network.target local-fs.target
- )m4_dnl
++After=local-fs.target
  
  [Install]
  WantedBy=multi-user.target