From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Tue, 6 Jan 2015 14:51:29 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
X-Git-Tag: v2.17-core89~71^2~2^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=f0dd06542596fa14cb0ef3bbaeb3ae16ee78c325

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
	config/etc/logrotate.conf
---

f0dd06542596fa14cb0ef3bbaeb3ae16ee78c325
diff --cc config/rootfiles/common/armv5tel/initscripts
index c761e26672,980441599e..e529e6644f
mode 100755,100644..100755
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@@ -53,9 -52,9 +52,10 @@@ etc/rc.d/init.d/mISD
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
  #etc/rc.d/init.d/motion
 +#etc/rc.d/init.d/monit
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
+ etc/rc.d/init.d/mounttmpfs
  #etc/rc.d/init.d/mpd
  #etc/rc.d/init.d/mysql
  #etc/rc.d/init.d/netsnmpd
diff --cc config/rootfiles/common/i586/initscripts
index 525c55c455,d0bc8c5c20..58b67c88fb
mode 100755,100644..100755
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
diff --cc lfs/initscripts
index 4acf65e13e,4894710ac3..4894710ac3
mode 100755,100644..100755
--- a/lfs/initscripts
+++ b/lfs/initscripts