This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 2ab07f7ef331663a44757e82d6d16c325da6e092 (commit) via 7f5b009ad57926e217df66988513a81f05fb539b (commit) via 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd (commit) via aa8245cbd54e3ba68903580381de4d60816606c5 (commit) via bdc84c9f9221a31d11e364bdf28013ffc30d31a6 (commit) via 51dcdbc3b94ea73fddd77c73f1a54dded06db7c0 (commit) via f2d2ce590242a64baff8343c6707944fef4dd7bb (commit) via 4262c16b36f8d13a80cddff9b4c49a6bf0ab153f (commit) from d003cffe573eb68ca3a82de35605e75f84023636 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 2ab07f7ef331663a44757e82d6d16c325da6e092 Merge: d003cff 7f5b009 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 6 22:37:13 2010 +0200

Merge branch 'core40'

-----------------------------------------------------------------------

Summary of changes: config/etc/fstab | 2 +- config/rootfiles/core/40/update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index c0f98b3..4860d6f 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -10,5 +10,5 @@ sysfs /sys sysfs defaults 0 0 devpts /dev/pts devpts gid=4,mode=620 0 0 #none /tmp tmpfs defaults 0 0 none /var/log/rrd tmpfs defaults,size=64M 0 0 -none /var/lock tmpfs defaults,size=2M 0 0 +none /var/lock tmpfs defaults,size=8M 0 0 none /var/run tmpfs defaults,size=2M 0 0 diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh index 88c067d..fa420c1 100644 --- a/config/rootfiles/core/40/update.sh +++ b/config/rootfiles/core/40/update.sh @@ -45,7 +45,7 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Change var lock size to 8MB grep -v "/var/lock" /etc/fstab > /tmp/fstab.tmp mv /tmp/fstab.tmp /etc/fstab -echo non /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab +echo none /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab

#Rebuild module dep's

hooks/post-receive -- IPFire 2.x development tree